diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-03-02 12:26:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-02 12:26:15 +0300 |
| commit | 721f4d813b1c20274cd58e0511191ce6619edf14 (patch) | |
| tree | 40e6a2caefcfc0108d9991c2564247e2a228c011 /apps/files | |
| parent | 9ddf654d5802b903ba2ee5c05ae2c536bb5a8338 (diff) | |
| parent | 9bc0e01d2453a812a5c4b84289dbafc72bf5c45e (diff) | |
Merge pull request #31256 from nextcloud/backport/31143/stable22
[stable22] Don't redirect when loading files index page
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 2 | ||||
| -rw-r--r-- | apps/files/tests/Controller/ViewControllerTest.php | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index fd84998769d..dbb852ffeb8 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -184,7 +184,7 @@ class ViewController extends Controller { * @throws NotFoundException */ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false, $openfile = null) { - if ($fileid !== null) { + if ($fileid !== null && $dir === '') { try { return $this->redirectToFile($fileid); } catch (NotFoundException $e) { diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index d7b298d9e84..33467f1464b 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -459,7 +459,7 @@ class ViewControllerTest extends TestCase { ->willReturn('/apps/files/?dir=/test/sub'); $expected = new Http\RedirectResponse('/apps/files/?dir=/test/sub'); - $this->assertEquals($expected, $this->viewController->index('/whatever', '', '123')); + $this->assertEquals($expected, $this->viewController->index('', '', '123')); } public function testShowFileRouteWithFile() { @@ -499,7 +499,7 @@ class ViewControllerTest extends TestCase { ->willReturn('/apps/files/?dir=/test/sub&scrollto=somefile.txt'); $expected = new Http\RedirectResponse('/apps/files/?dir=/test/sub&scrollto=somefile.txt'); - $this->assertEquals($expected, $this->viewController->index('/whatever', '', '123')); + $this->assertEquals($expected, $this->viewController->index('', '', '123')); } public function testShowFileRouteWithInvalidFileId() { @@ -519,7 +519,7 @@ class ViewControllerTest extends TestCase { ->with('files.view.index', ['fileNotFound' => true]) ->willReturn('redirect.url'); - $response = $this->viewController->index('MyDir', 'MyView', '123'); + $response = $this->viewController->index('', 'MyView', '123'); $this->assertInstanceOf('OCP\AppFramework\Http\RedirectResponse', $response); $this->assertEquals('redirect.url', $response->getRedirectURL()); } @@ -576,6 +576,6 @@ class ViewControllerTest extends TestCase { ->willReturn('/apps/files/?view=trashbin&dir=/test.d1462861890/sub&scrollto=somefile.txt'); $expected = new Http\RedirectResponse('/apps/files/?view=trashbin&dir=/test.d1462861890/sub&scrollto=somefile.txt'); - $this->assertEquals($expected, $this->viewController->index('/whatever', '', '123')); + $this->assertEquals($expected, $this->viewController->index('', '', '123')); } } |