Merge pull request #18744 from owncloud/fix-ocs-router

Delay adding OCS prefix to route collection until all is loaded
This commit is contained in:
Morris Jobke 2015-09-02 08:05:15 +02:00
commit 73b43db4f9
1 changed files with 3 additions and 2 deletions

View File

@ -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');