diff options
| author | Kate <26026535+provokateurin@users.noreply.github.com> | 2025-02-19 11:46:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-19 11:46:14 +0100 |
| commit | 4c6c93dc842fb383d72472a5ba1aaa84be13f8d4 (patch) | |
| tree | 5e8a5834f43dc77a7027eab3cc58045285eecb9c /apps | |
| parent | 78f532dd31e8f89ea53e16c6d8f64d01483b5271 (diff) | |
| parent | 50a6f2540c37f7c4b74423a4700b00fdc554d24c (diff) | |
| download | nextcloud-server-4c6c93dc842fb383d72472a5ba1aaa84be13f8d4.tar.gz nextcloud-server-4c6c93dc842fb383d72472a5ba1aaa84be13f8d4.zip | |
Merge pull request #50862 from nextcloud/backport/50860/stable30
[stable30] fix(activity): Fix activity parameter types
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CardDAV/Activity/Provider/Base.php | 4 | ||||
| -rw-r--r-- | apps/systemtags/lib/Activity/Provider.php | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/dav/lib/CardDAV/Activity/Provider/Base.php b/apps/dav/lib/CardDAV/Activity/Provider/Base.php index 0a1b55efb08..efc7827c220 100644 --- a/apps/dav/lib/CardDAV/Activity/Provider/Base.php +++ b/apps/dav/lib/CardDAV/Activity/Provider/Base.php @@ -55,14 +55,14 @@ abstract class Base implements IProvider { $data['name'] === CardDavBackend::PERSONAL_ADDRESSBOOK_NAME) { return [ 'type' => 'addressbook', - 'id' => $data['id'], + 'id' => (string)$data['id'], 'name' => $l->t('Personal'), ]; } return [ 'type' => 'addressbook', - 'id' => $data['id'], + 'id' => (string)$data['id'], 'name' => $data['name'], ]; } diff --git a/apps/systemtags/lib/Activity/Provider.php b/apps/systemtags/lib/Activity/Provider.php index e555fc56a50..ab8e326d8d9 100644 --- a/apps/systemtags/lib/Activity/Provider.php +++ b/apps/systemtags/lib/Activity/Provider.php @@ -285,7 +285,7 @@ class Provider implements IProvider { protected function getFileParameter($id, $path) { return [ 'type' => 'file', - 'id' => $id, + 'id' => (string)$id, 'name' => basename($path), 'path' => trim($path, '/'), ]; @@ -296,7 +296,7 @@ class Provider implements IProvider { if ($tagData === null) { [$name, $status] = explode('|||', substr($parameter, 3, -3)); $tagData = [ - 'id' => 0,// No way to recover the ID + 'id' => '0',// No way to recover the ID 'name' => $name, 'assignable' => $status === 'assignable', 'visible' => $status !== 'invisible', @@ -305,7 +305,7 @@ class Provider implements IProvider { return [ 'type' => 'systemtag', - 'id' => (int) $tagData['id'], + 'id' => (string)$tagData['id'], 'name' => $tagData['name'], 'assignable' => $tagData['assignable'] ? '1' : '0', 'visibility' => $tagData['visible'] ? '1' : '0', |