summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--core/routes.php2
-rw-r--r--lib/router.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/routes.php b/core/routes.php
index 5c99c542d48..cc0aa53a21e 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -6,8 +6,6 @@
* See the COPYING-README file.
*/
-require_once 'settings/routes.php';
-
// Core ajax actions
// Search
$this->create('search_ajax_search', '/search/ajax/search.php')
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) {