diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2025-02-18 15:05:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-18 15:05:22 +0100 |
| commit | d37a74dabfce622433c89d8dbaab004596a8dbee (patch) | |
| tree | d5e4a6bc1df8e9fd1dafd7ec6cb60a4259bdee12 | |
| parent | 1255a482ddf95e1256450e0ac16548a4d49a8f46 (diff) | |
| parent | b041438dc9fe91f39cc6f5f9fb4d2bcdbb4be481 (diff) | |
| download | nextcloud-server-d37a74dabfce622433c89d8dbaab004596a8dbee.tar.gz nextcloud-server-d37a74dabfce622433c89d8dbaab004596a8dbee.zip | |
Merge pull request #50863 from nextcloud/backport/50860/stable31
[stable31] fix(activity): Fix activity parameter types
| -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 ee430668a32..0c73c8558d0 100644 --- a/apps/dav/lib/CardDAV/Activity/Provider/Base.php +++ b/apps/dav/lib/CardDAV/Activity/Provider/Base.php @@ -45,14 +45,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 e2abebab208..c979f8143a8 100644 --- a/apps/systemtags/lib/Activity/Provider.php +++ b/apps/systemtags/lib/Activity/Provider.php @@ -275,7 +275,7 @@ class Provider implements IProvider { protected function getFileParameter($id, $path) { return [ 'type' => 'file', - 'id' => $id, + 'id' => (string)$id, 'name' => basename($path), 'path' => trim($path, '/'), ]; @@ -286,7 +286,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', @@ -295,7 +295,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', |