diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-28 19:29:49 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-29 15:04:56 +0100 |
| commit | a9ff5635d800c77e78928e5fd35e796ec6bc70f6 (patch) | |
| tree | 1dc30a240e014085e5268a15b9fd15244c10a143 /lib/router.php | |
| parent | ed7accd237bae2bd76df5e6256d8ee2ce2f14308 (diff) | |
| download | nextcloud-server-a9ff5635d800c77e78928e5fd35e796ec6bc70f6.tar.gz nextcloud-server-a9ff5635d800c77e78928e5fd35e796ec6bc70f6.zip | |
Move loading setting routing to OC_Router
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php index dae2e91372e..7bbc546d757 100644 --- a/lib/router.php +++ b/lib/router.php @@ -47,6 +47,7 @@ class OC_Router { public function getCacheKey() { if (!isset($this->cache_key)) { $files = $this->getRoutingFiles(); + $files[] = 'settings/routes.php'; $files[] = 'core/routes.php'; $this->cache_key = OC_Cache::generateCacheKeyFromFiles($files); } @@ -64,7 +65,8 @@ class OC_Router { $this->root->addCollection($collection, '/apps/'.$app); } $this->useCollection('root'); - require_once('core/routes.php'); + require_once 'settings/routes.php'; + require_once 'core/routes.php'; } protected function getCollection($name) { |