diff options
Diffstat (limited to 'apps/files/lib/Controller/ViewController.php')
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 88d9a32039b..38e3858cd38 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -237,9 +237,11 @@ class ViewController extends Controller { if ($fileid && $dir !== '') { $baseFolder = $this->rootFolder->getUserFolder($userId); $nodes = $baseFolder->getById((int) $fileid); - $relativePath = dirname($baseFolder->getRelativePath($nodes[0]->getPath())); - // If the requested path is different from the file path - if (count($nodes) === 1 && $relativePath !== $dir) { + $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); } } |