From cc9b36131cf971f51d638501ef4da73c9fbedf18 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 19 Aug 2016 10:10:19 +0200
Subject: When requesting a permalink to an invalid file redirect

We need to do the redirect to update address bar.
---
 apps/files/lib/Controller/ViewController.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'apps/files/lib/Controller/ViewController.php')

diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
index 9d26c048368..db8f32ddf73 100644
--- a/apps/files/lib/Controller/ViewController.php
+++ b/apps/files/lib/Controller/ViewController.php
@@ -143,15 +143,14 @@ class ViewController extends Controller {
 	 * @param string $dir
 	 * @param string $view
 	 * @param string $fileid
-	 * @return TemplateResponse
+	 * @return TemplateResponse|RedirectResponse
 	 */
-	public function index($dir = '', $view = '', $fileid = null) {
-		$fileNotFound = false;
+	public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
 		if ($fileid !== null) {
 			try {
 				return $this->showFile($fileid);
 			} catch (NotFoundException $e) {
-				$fileNotFound = true;
+				return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
 			}
 		}
 
-- 
cgit v1.2.3