upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #41552 from nextcloud/backport/41518/stable26

Browse source 
[stable26] fix(files_versions): don't call getUid() on null
This commit is contained in:
Git'Fellow 2023-11-16 23:59:56 +01:00 committed by GitHub
commit b0b04084f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/files_versions/lib/Listener/FileEventsListener.php
View file

@ -349,7 +349,7 @@ class FileEventsListener implements IEventListener {
/** /**
* Retrieve the path relative to the current user root folder. * Retrieve the path relative to the current user root folder.
* If no user is connected, use the node's owner. * If no user is connected, try to use the node's owner.
*/ */
private function getPathForNode(Node $node): ?string { private function getPathForNode(Node $node): ?string {
try { try {
@ -357,8 +357,12 @@ class FileEventsListener implements IEventListener {
->getUserFolder(\OC_User::getUser()) ->getUserFolder(\OC_User::getUser())
->getRelativePath($node->getPath()); ->getRelativePath($node->getPath());
} catch (\Throwable $ex) { } catch (\Throwable $ex) {
$owner = $node->getOwner();
if ($owner === null) {
return null;
}
return $this->rootFolder return $this->rootFolder
->getUserFolder($node->getOwner()->getUid()) ->getUserFolder($owner->getUid())
->getRelativePath($node->getPath()); ->getRelativePath($node->getPath());
} }
} }