upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #50448 from nextcloud/backport/50447/stable30

Browse source 
[stable30] fix: Ensure `label` is always a string
This commit is contained in:
Andy Scherzinger 2025-01-26 21:36:33 +01:00 committed by GitHub
commit 65e9059e65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/files_sharing/lib/Controller/ShareAPIController.php
View file

@ -733,7 +733,10 @@ class ShareAPIController extends OCSController {
}
// If we have a label, use it
if (!empty($label)) {
if ($label !== '') {
if (strlen($label) > 255) {
throw new OCSBadRequestException('Maximum label length is 255');
}
$share->setLabel($label);
}

2
apps/sharebymail/lib/ShareByMailProvider.php
View file

@ -1005,7 +1005,7 @@ class ShareByMailProvider extends DefaultShareProvider implements IShareProvider
$share->setPassword($data['password']);
$passwordExpirationTime = \DateTime::createFromFormat('Y-m-d H:i:s', $data['password_expiration_time'] ?? '');
$share->setPasswordExpirationTime($passwordExpirationTime !== false ? $passwordExpirationTime : null);
$share->setLabel($data['label']);
$share->setLabel($data['label'] ?? '');
$share->setSendPasswordByTalk((bool)$data['password_by_talk']);
$share->setHideDownload((bool)$data['hide_download']);

3
lib/private/Share20/Share.php
View file

@ -66,13 +66,12 @@ class Share implements IShare {
private $shareTime;
/** @var bool */
private $mailSend;
/** @var string */
private $label = '';
/** @var ICacheEntry|null */
private $nodeCacheEntry;
/** @var bool */
private $hideDownload = false;
private string $label = '';
private bool $noExpirationDate = false;
public function __construct(