diff options
Diffstat (limited to 'lib/private/Route/Router.php')
| -rw-r--r-- | lib/private/Route/Router.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Route/Router.php b/lib/private/Route/Router.php index 1839b356424..3d91a33cd8a 100644 --- a/lib/private/Route/Router.php +++ b/lib/private/Route/Router.php @@ -162,7 +162,6 @@ class Router implements IRouter { if (!isset($this->loadedApps['core'])) { $this->loadedApps['core'] = true; $this->useCollection('root'); - require_once __DIR__ . '/../../../settings/routes.php'; require_once __DIR__ . '/../../../core/routes.php'; // Also add the OCS collection @@ -258,7 +257,9 @@ class Router implements IRouter { $app = \OC_App::cleanAppId($app); \OC::$REQUESTEDAPP = $app; $this->loadRoutes($app); - } else if (substr($url, 0, 6) === '/core/' or substr($url, 0, 10) === '/settings/') { + } else if (substr($url, 0, 10) === '/settings/') { + $this->loadRoutes('settings'); + } else if (substr($url, 0, 6) === '/core/') { \OC::$REQUESTEDAPP = $url; if (!\OC::$server->getConfig()->getSystemValueBool('maintenance') && !Util::needUpgrade()) { \OC_App::loadApps(); |