Move loading of routes to OC_Router

2 files changed, 15 insertions, 19 deletions

diff --git a/lib/api.php b/lib/api.php
index 757e53226b9..00a3dc108e1 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -53,10 +53,6 @@ class OC_API {
 	* @param array $parameters
 	*/
 	public static function call($parameters){
-		
-		// Get the routes
-		self::loadRoutes();
-		
 		$name = $parameters['_name'];
 		// Loop through registered actions
 		foreach(self::$actions[$name] as $action){
@@ -105,21 +101,6 @@ class OC_API {
 	}
 	
 	/**
-	 * loads the api routes
-	 */
-	private static function loadRoutes(){
-		// TODO cache
-		foreach(OC_APP::getEnabledApps() as $app){
-			$file = OC_App::getAppPath($app).'/appinfo/routes.php';
-			if(file_exists($file)){
-				require_once($file);
-			}
-		}
-		// include core routes
-		require_once(OC::$SERVERROOT.'ocs/routes.php');
-	}
-	
-	/**
 	* respond to a call
 	* @param int|array $response the response
 	* @param string $format the format xml|json
diff --git a/lib/router.php b/lib/router.php
index f037ecdfef4..f76f64ac82b 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -16,6 +16,21 @@ class OC_Router {
 	protected $collections = array();
 	protected $collection = null;
 
+	/**
+	 * loads the api routes
+	 */
+	public function loadRoutes(){
+		// TODO cache
+		foreach(OC_APP::getEnabledApps() as $app){
+			$file = OC_App::getAppPath($app).'/appinfo/routes.php';
+			if(file_exists($file)){
+				require_once($file);
+			}
+		}
+		// include ocs routes
+		require_once(OC::$SERVERROOT.'/ocs/routes.php');
+	}
+
 	public function useCollection($name) {
 		if (!isset($this->collections[$name])) {
 			$this->collections[$name] = new RouteCollection();