diff options
| author | provokateurin <kate@provokateurin.de> | 2025-05-05 13:50:26 +0200 |
|---|---|---|
| committer | provokateurin <kate@provokateurin.de> | 2025-05-05 14:05:35 +0200 |
| commit | cfdb919c37f979b884977f467d51a2567bd74273 (patch) | |
| tree | 3c51d228d55f813b48f6e43400048c52367956e6 | |
| parent | 47834591444a64a8f1a041ada241d4b69ca8b7da (diff) | |
| download | nextcloud-server-fix/files/activity-rich-object-strings.tar.gz nextcloud-server-fix/files/activity-rich-object-strings.zip | |
fix(files): Fix non-string values for activity rich object stringsfix/files/activity-rich-object-strings
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 ]; } |