From a4734e0cf5a07b5bb382c59039afd3f912d3ddc3 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 20 Nov 2023 10:55:41 +0100 Subject: [PATCH] Revert "[stable26] fix(files_versions): don't call getUid() on null" --- apps/files_versions/lib/Listener/FileEventsListener.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/files_versions/lib/Listener/FileEventsListener.php b/apps/files_versions/lib/Listener/FileEventsListener.php index ad2809c029c59..fe638364b9d0d 100644 --- a/apps/files_versions/lib/Listener/FileEventsListener.php +++ b/apps/files_versions/lib/Listener/FileEventsListener.php @@ -349,7 +349,7 @@ public function pre_renameOrCopy_hook(Node $source, Node $target): void { /** * Retrieve the path relative to the current user root folder. - * If no user is connected, try to use the node's owner. + * If no user is connected, use the node's owner. */ private function getPathForNode(Node $node): ?string { try { @@ -357,12 +357,8 @@ private function getPathForNode(Node $node): ?string { ->getUserFolder(\OC_User::getUser()) ->getRelativePath($node->getPath()); } catch (\Throwable $ex) { - $owner = $node->getOwner(); - if ($owner === null) { - return null; - } return $this->rootFolder - ->getUserFolder($owner->getUid()) + ->getUserFolder($node->getOwner()->getUid()) ->getRelativePath($node->getPath()); } }