Merge pull request #42427 from nextcloud/fix/issue-42418

nextcloud · Dec 29, 2023 · 86575c9 · 86575c9
2 parents 6a63974 + a668778
commit 86575c9
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -237,12 +237,16 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
 		if ($fileid && $dir !== '') {
 			$baseFolder = $this->rootFolder->getUserFolder($userId);
 			$nodes = $baseFolder->getById((int) $fileid);
-			$nodePath = $baseFolder->getRelativePath($nodes[0]->getPath());
-			$relativePath = $nodePath ? dirname($nodePath) : '';
-			// If the requested path does not contain the file id
-			// or if the requested path is not the file id itself
-			if (count($nodes) === 1 && $relativePath !== $dir && $nodePath !== $dir) {
-				return $this->redirectToFile((int) $fileid);
+			if (!empty($nodes)) {
+				$nodePath = $baseFolder->getRelativePath($nodes[0]->getPath());
+				$relativePath = $nodePath ? dirname($nodePath) : '';
+				// If the requested path does not contain the file id
+				// or if the requested path is not the file id itself
+				if (count($nodes) === 1 && $relativePath !== $dir && $nodePath !== $dir) {
+					return $this->redirectToFile((int) $fileid);
+				}
+			} else { // fileid does not exist anywhere
+				$fileNotFound = true;
 			}
 		}