Merge pull request #42921 from nextcloud/backport/42891/stable28

[stable28] Improve path resolution in files_version hooks
nextcloud · Jan 18, 2024 · ddb95ce · ddb95ce
2 parents 1fc8978 + eaddf36
commit ddb95ce
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/apps/files_versions/lib/Listener/FileEventsListener.php b/apps/files_versions/lib/Listener/FileEventsListener.php
@@ -350,16 +350,24 @@ public function pre_renameOrCopy_hook(Node $source, Node $target): void {
 	private function getPathForNode(Node $node): ?string {
 		$user = $this->userSession->getUser()?->getUID();
 		if ($user) {
-			return $this->rootFolder
+			$path = $this->rootFolder
 				->getUserFolder($user)
 				->getRelativePath($node->getPath());
+
+			if ($path !== null) {
+				return $path;
+			}
 		}
 
 		$owner = $node->getOwner()?->getUid();
 		if ($owner) {
-			return $this->rootFolder
+			$path = $this->rootFolder
 				->getUserFolder($owner)
 				->getRelativePath($node->getPath());
+
+			if ($path !== null) {
+				return $path;
+			}
 		}
 
 		return null;