merge master into filesystem

1 files changed, 18 insertions, 0 deletions

diff --git a/lib/router.php b/lib/router.php
index 8cb8fd4f33b..27e14c38abf 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -58,6 +58,23 @@ 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;
@@ -67,6 +84,7 @@ class OC_Router {
 		$this->useCollection('root');
 		require_once 'settings/routes.php';
 		require_once 'core/routes.php';
+
 	}
 
 	protected function getCollection($name) {