summaryrefslogtreecommitdiffstats
path: root/lib/base.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-03-10 14:04:58 +0100
committerRobin Appelman <icewind@owncloud.com>2014-03-10 14:04:58 +0100
commit8ab7d18a6a2b023527d2eef63099e2834c46ec97 (patch)
tree393f7f704655555a1892200215a46f4b741abc80 /lib/base.php
parent0ffd32a1ae8c4b9da2434a0b5623c1fe6e910467 (diff)
downloadnextcloud-server-8ab7d18a6a2b023527d2eef63099e2834c46ec97.tar.gz
nextcloud-server-8ab7d18a6a2b023527d2eef63099e2834c46ec97.zip
Move the router classes to a namespace and expose it with a public interface
Diffstat (limited to 'lib/base.php')
-rw-r--r--lib/base.php14
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/base.php b/lib/base.php
index 86ee5349828..d49dd958310 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -74,11 +74,6 @@ class OC {
public static $CLI = false;
/**
- * @var OC_Router
- */
- protected static $router = null;
-
- /**
* @var \OC\Session\Session
*/
public static $session = null;
@@ -388,15 +383,10 @@ class OC {
}
/**
- * @return OC_Router
+ * @return \OCP\Route\IRouter
*/
public static function getRouter() {
- if (!isset(OC::$router)) {
- OC::$router = new OC_Router();
- OC::$router->loadRoutes();
- }
-
- return OC::$router;
+ return self::$server->getRouter();
}