diff options
author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-01 15:42:41 +0100 |
---|---|---|
committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-09-01 15:42:41 +0100 |
commit | 5b2529b44803b80cc9eab9f356623650d5e5986f (patch) | |
tree | dd7e2fca6a254b9347aecae0b6d93817c5a6667e /lib | |
parent | 87b3e28f06bc96c28fab65d8b297753f686ba58b (diff) | |
download | nextcloud-server-5b2529b44803b80cc9eab9f356623650d5e5986f.tar.gz nextcloud-server-5b2529b44803b80cc9eab9f356623650d5e5986f.zip |
Delay adding OCS prefix to route collection until all is loaded
->addPrefix() iterates over all registered routes, so must be run after
all apps have had a chance to load their OCS routes.
Diffstat (limited to 'lib')
-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 33669452f2d..7b7849a6da0 100644 --- a/lib/private/route/router.php +++ b/lib/private/route/router.php @@ -169,8 +169,9 @@ class Router implements IRouter { $this->useCollection('root'); require_once 'settings/routes.php'; require_once 'core/routes.php'; - - // include ocs routes + } + if ($this->loaded) { + // include ocs routes, must be loaded last for /ocs prefix require_once 'ocs/routes.php'; $collection = $this->getCollection('ocs'); $collection->addPrefix('/ocs'); |