diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-01-07 15:34:42 +0100 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-01-07 15:34:42 +0100 |
commit | f80bc4ed5370af66e5275dd9fb92d1a61d38b46b (patch) | |
tree | bb6f1e54831a7df7fcd726381242ebd136ab2df8 | |
parent | 3dbb148567cb2954fdd196ca6fdf4c008e2a3682 (diff) | |
download | nextcloud-server-f80bc4ed5370af66e5275dd9fb92d1a61d38b46b.tar.gz nextcloud-server-f80bc4ed5370af66e5275dd9fb92d1a61d38b46b.zip |
fixed error that displayed a white page and a warning that routes could not be loaded from apps that was caused by the ocs_api merge
-rw-r--r-- | lib/router.php | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/router.php b/lib/router.php index 27e14c38abf..070d31999b1 100644 --- a/lib/router.php +++ b/lib/router.php @@ -58,23 +58,6 @@ class OC_Router { * loads the api routes */ public function loadRoutes() { - - // TODO cache - $this->root = $this->getCollection('root'); - foreach(OC_APP::getEnabledApps() as $app){ - $file = OC_App::getAppPath($app).'/appinfo/routes.php'; - if(file_exists($file)){ - $this->useCollection($app); - require_once($file); - $collection = $this->getCollection($app); - $this->root->addCollection($collection, '/apps/'.$app); - } - } - // include ocs routes - require_once(OC::$SERVERROOT.'/ocs/routes.php'); - $collection = $this->getCollection('ocs'); - $this->root->addCollection($collection, '/ocs'); - foreach($this->getRoutingFiles() as $app => $file) { $this->useCollection($app); require_once $file; |