Skip to content
Snippets Groups Projects
Commit f80bc4ed authored by Bernhard Posselt's avatar Bernhard Posselt
Browse files

fixed error that displayed a white page and a warning that routes could not be...

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
parent 3dbb1485
No related branches found
No related tags found
No related merge requests found
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment