diff options
| author | Joas Schilling <coding@schilljs.com> | 2025-02-17 15:49:31 +0100 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2025-02-17 16:35:29 +0000 |
| commit | b041438dc9fe91f39cc6f5f9fb4d2bcdbb4be481 (patch) | |
| tree | b48c2215729ff614ea2ac90e3c2789e62b7f1e94 | |
| parent | 69eced3387312316f44e033700b63c45572d3646 (diff) | |
| download | nextcloud-server-b041438dc9fe91f39cc6f5f9fb4d2bcdbb4be481.tar.gz nextcloud-server-b041438dc9fe91f39cc6f5f9fb4d2bcdbb4be481.zip | |
fix(activity): Fix activity parameter typesbackport/50860/stable31
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -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', |