diff options
| author | provokateurin <kate@provokateurin.de> | 2025-05-05 13:50:26 +0200 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2025-05-06 12:06:43 +0000 |
| commit | 67e60d97114e1090484f4bb7a31e5f83c35d2d38 (patch) | |
| tree | 212cc072698d8e46f86255fb1ffd85764b2cd5a5 | |
| parent | 1402f6d6b8585d86fdc74fe7e11c0ca62e6f2d6a (diff) | |
| download | nextcloud-server-backport/52630/stable31.tar.gz nextcloud-server-backport/52630/stable31.zip | |
fix(files): Fix non-string values for activity rich object stringsbackport/52630/stable31
Signed-off-by: provokateurin <kate@provokateurin.de>
| -rw-r--r-- | apps/files/lib/Activity/Provider.php | 6 | ||||
| -rw-r--r-- | apps/files/tests/Activity/ProviderTest.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index 0b8e051c877..faa2bbd0b3b 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -319,7 +319,7 @@ class Provider implements IProvider { protected function getFile($parameter, ?IEvent $event = null): array { if (is_array($parameter)) { $path = reset($parameter); - $id = (string)key($parameter); + $id = (int)key($parameter); } elseif ($event !== null) { // Legacy from before ownCloud 8.2 $path = $parameter; @@ -341,7 +341,7 @@ class Provider implements IProvider { return [ 'type' => 'file', - 'id' => $encryptionContainer->getId(), + 'id' => (string)$encryptionContainer->getId(), 'name' => $encryptionContainer->getName(), 'path' => $path, 'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $encryptionContainer->getId()]), @@ -354,7 +354,7 @@ class Provider implements IProvider { return [ 'type' => 'file', - 'id' => $id, + 'id' => (string)$id, 'name' => basename($path), 'path' => trim($path, '/'), 'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]), diff --git a/apps/files/tests/Activity/ProviderTest.php b/apps/files/tests/Activity/ProviderTest.php index 7803563a11c..7b91e980842 100644 --- a/apps/files/tests/Activity/ProviderTest.php +++ b/apps/files/tests/Activity/ProviderTest.php @@ -93,7 +93,7 @@ class ProviderTest extends TestCase { return [ [[42 => '/FortyTwo.txt'], null, '42', 'FortyTwo.txt', 'FortyTwo.txt'], [['23' => '/Twenty/Three.txt'], null, '23', 'Three.txt', 'Twenty/Three.txt'], - ['/Foo/Bar.txt', 128, 128, 'Bar.txt', 'Foo/Bar.txt'], // Legacy from ownCloud 8.2 and before + ['/Foo/Bar.txt', 128, '128', 'Bar.txt', 'Foo/Bar.txt'], // Legacy from ownCloud 8.2 and before ]; } |