diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-08-12 16:52:36 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-08-12 16:52:36 +0200 |
| commit | db4111f6d50d5bf2195d4a082ffc9dcea1d911ce (patch) | |
| tree | 60395e2413ce28434b3d27461f11ed4bd70f0a46 /lib | |
| parent | 8c024947440e2f15a9effe5fe6d91e60e8571a07 (diff) | |
| download | nextcloud-server-db4111f6d50d5bf2195d4a082ffc9dcea1d911ce.tar.gz nextcloud-server-db4111f6d50d5bf2195d4a082ffc9dcea1d911ce.zip | |
Routing: Add some core routes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 3 | ||||
| -rw-r--r-- | lib/router.php | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 0d7e224d354..3abfdb35668 100644 --- a/lib/base.php +++ b/lib/base.php @@ -440,8 +440,8 @@ class OC{ } // Someone is logged in : if(OC_User::isLoggedIn()) { - OC_App::loadApps(); if(isset($_GET["logout"]) and ($_GET["logout"])) { + OC_App::loadApps(); OC_User::logout(); header("Location: ".OC::$WEBROOT.'/'); }else{ @@ -461,6 +461,7 @@ class OC{ } public static function loadAppScriptFile($param) { + OC_App::loadApps(); $app = $param['app']; $file = $param['file']; $app_path = OC_App::getAppPath($app); diff --git a/lib/router.php b/lib/router.php index eca59d6dc3b..65fc51aff2c 100644 --- a/lib/router.php +++ b/lib/router.php @@ -34,6 +34,8 @@ class OC_Router { $this->root->addCollection($collection, '/apps/'.$app); } } + $this->useCollection('root'); + require_once('core/routes.php'); } protected function getCollection($name) { |