From f80bc4ed5370af66e5275dd9fb92d1a61d38b46b Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Mon, 7 Jan 2013 15:34:42 +0100 Subject: [PATCH] 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 --- lib/router.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/lib/router.php b/lib/router.php index 27e14c38ab..070d31999b 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;