sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move loading setting routing to OC_Router

remotes/origin/stable5
Bart Visscher 2012-10-28 19:29:49 +07:00
parent ed7accd237
commit a9ff5635d8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/routes.php
Unescape Escape View File

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

4
lib/router.php
Unescape Escape View File

@ -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) {