diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-10-12 17:51:56 +0200 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-10-17 18:47:56 +0200 |
| commit | 788233c3d751dceb57f30b4d0bbd49ea183cf9b8 (patch) | |
| tree | 9dd29a36231e1c00c10449332db4a019aaf5153e /lib/private | |
| parent | bc706ac24a2cad5a4e6a319f1de5b4c977546f72 (diff) | |
| download | nextcloud-server-788233c3d751dceb57f30b4d0bbd49ea183cf9b8.tar.gz nextcloud-server-788233c3d751dceb57f30b4d0bbd49ea183cf9b8.zip | |
fix(share): Return empty string if no label is setbackport/48673/stable28
* Resolves: https://github.com/nextcloud/server/issues/48629
While the database supports NULL, the typing has always said it only returns *string*.
So to not break any apps that might trust the typings we should return `''` if the database is set to `NULL`.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Share20/DefaultShareProvider.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php index 75e853164b2..05346822381 100644 --- a/lib/private/Share20/DefaultShareProvider.php +++ b/lib/private/Share20/DefaultShareProvider.php @@ -1048,7 +1048,7 @@ class DefaultShareProvider implements IShareProvider { $qb->expr()->eq('item_type', $qb->createNamedParameter('file')), $qb->expr()->eq('item_type', $qb->createNamedParameter('folder')) )) - ->execute(); + ->executeQuery(); $data = $cursor->fetch(); @@ -1081,7 +1081,7 @@ class DefaultShareProvider implements IShareProvider { ->setNote((string)$data['note']) ->setMailSend((bool)$data['mail_send']) ->setStatus((int)$data['accepted']) - ->setLabel($data['label']); + ->setLabel($data['label'] ?? ''); $shareTime = new \DateTime(); $shareTime->setTimestamp((int)$data['stime']); |