aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/route/router.php
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@karoshi.org.uk>2015-08-06 16:08:02 +0100
committerRobin McCorkell <rmccorkell@karoshi.org.uk>2015-08-06 16:09:34 +0100
commit50ebea41f60f2864a565ea9985c5462c2df5f09e (patch)
treed666dfe6bc8c56aedb2d8e289ceea0d790123205 /lib/private/route/router.php
parent6c139674a4dc6b9984bb303d7006854a6c9c6f3b (diff)
downloadnextcloud-server-50ebea41f60f2864a565ea9985c5462c2df5f09e.tar.gz
nextcloud-server-50ebea41f60f2864a565ea9985c5462c2df5f09e.zip
Only load app routes if the app has already been loaded
Diffstat (limited to 'lib/private/route/router.php')
-rw-r--r--lib/private/route/router.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 48992366092..33669452f2d 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -150,6 +150,12 @@ class Router implements IRouter {
\OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes');
foreach ($routingFiles as $app => $file) {
if (!isset($this->loadedApps[$app])) {
+ if (!\OC_App::isAppLoaded($app)) {
+ // app MUST be loaded before app routes
+ // try again next time loadRoutes() is called
+ $this->loaded = false;
+ continue;
+ }
$this->loadedApps[$app] = true;
$this->useCollection($app);
$this->requireRouteFile($file, $app);