diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index be5069b7f61..8de679f25dd 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -237,12 +237,16 @@ class ViewController extends Controller { 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; } } |