mirror of
https://github.com/nextcloud/server.git
synced 2024-08-09 14:13:00 +02:00
Move loading setting routing to OC_Router
This commit is contained in:
parent
ed7accd237
commit
a9ff5635d8
@ -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')
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user