Skip to content

Commit

Permalink
Merge pull request #316 from nextcloud/automated/noid/master-update-n…
Browse files Browse the repository at this point in the history
…extcloud-ocp

[master] Update nextcloud/ocp dependency
  • Loading branch information
nickvergessen authored Oct 10, 2022
2 parents 84c9d97 + ae08ac9 commit f626785
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
9 changes: 5 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions lib/Controller/SiteController.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use OCP\AppFramework\Http\RedirectResponse;
use OCP\AppFramework\Http\RedirectToDefaultAppResponse;
use OCP\AppFramework\Http\TemplateResponse;
use OCP\IConfig;
use OCP\IL10N;
Expand Down Expand Up @@ -67,7 +66,7 @@ public function showPage(int $id) {
$site = $this->sitesManager->getSiteById($id);
return $this->createResponse($id, $site);
} catch (SiteNotFoundException $e) {
return new RedirectToDefaultAppResponse();
return new RedirectResponse($this->url->linkToDefaultPageUrl());
}
}

Expand All @@ -90,7 +89,7 @@ public function showDefaultPage() {

// Redirect to default page when it's not the external sites app
if ($this->config->getSystemValue('defaultapp', 'files') !== 'external') {
return new RedirectToDefaultAppResponse();
return new RedirectResponse($this->url->linkToDefaultPageUrl());
}

// Fall back to the files app
Expand Down

0 comments on commit f626785

Please sign in to comment.