diff options
author | Olivier Paroz <github@oparoz.com> | 2015-07-29 01:47:00 +0300 |
---|---|---|
committer | Olivier Paroz <github@oparoz.com> | 2015-07-29 01:47:00 +0300 |
commit | 46d7571ac5037131114de9769eeffbcdb0e06342 (patch) | |
tree | 98759c83eaf8b4f6aa42814bebd578b85134756f /controller | |
parent | fcfec9510475c91733f91c975938601dd13cbc73 (diff) |
Remove Gallery+ detection
It's the responsibility of the 3rd party app to make sure they don't conflict with official apps
Diffstat (limited to 'controller')
-rw-r--r-- | controller/pagecontroller.php | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/controller/pagecontroller.php b/controller/pagecontroller.php index 4d629673..08fec9a7 100644 --- a/controller/pagecontroller.php +++ b/controller/pagecontroller.php @@ -96,26 +96,15 @@ class PageController extends Controller { */ public function index() { $appName = $this->appName; - if (\OCP\App::isEnabled('galleryplus')) { - $url = $this->urlGenerator->linkToRoute( - $appName . '.page.error_page', - [ - 'message' => "You need to disable the Gallery+ app before being able to use the official Gallery app", - 'code' => Http::STATUS_INTERNAL_SERVER_ERROR - ] - ); - return new RedirectResponse($url); - } else { - // Parameters sent to the template - $params = ['appName' => $appName]; + // Parameters sent to the template + $params = ['appName' => $appName]; - // Will render the page using the template found in templates/index.php - $response = new TemplateResponse($appName, 'index', $params); - $this->addContentSecurityToResponse($response); + // Will render the page using the template found in templates/index.php + $response = new TemplateResponse($appName, 'index', $params); + $this->addContentSecurityToResponse($response); - return $response; - } + return $response; } /** |