diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-09-02 08:05:15 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-09-02 08:05:15 +0200 |
| commit | 73b43db4f92e76a481ec3855354aef84f6b51c5e (patch) | |
| tree | 2bda18f5a8a8dc416f5a31b05656f10a7c10a5da /lib | |
| parent | 310084cc25b63ce05b208a426d54e34a2790a6b4 (diff) | |
| parent | 5b2529b44803b80cc9eab9f356623650d5e5986f (diff) | |
| download | nextcloud-server-73b43db4f92e76a481ec3855354aef84f6b51c5e.tar.gz nextcloud-server-73b43db4f92e76a481ec3855354aef84f6b51c5e.zip | |
Merge pull request #18744 from owncloud/fix-ocs-router
Delay adding OCS prefix to route collection until all is loaded
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'); |