diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-17 21:07:05 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-03-17 21:07:05 +0100 |
| commit | 756bbe87866471a25e1d437b60eb895d515fc103 (patch) | |
| tree | 7eb0b65f0aa481878451e515c6fb62a5c43bd0a9 /lib/base.php | |
| parent | 6fbf3dd7c4e64a68d2b8a0a2c24a1b92de7868b1 (diff) | |
| parent | 4a2b16d76dafbd83c3f8c137cba9edda375b206a (diff) | |
| download | nextcloud-server-756bbe87866471a25e1d437b60eb895d515fc103.tar.gz nextcloud-server-756bbe87866471a25e1d437b60eb895d515fc103.zip | |
Merge pull request #7649 from owncloud/routing-public
Move routing classes to an interface and expose it in the public api
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/lib/base.php b/lib/base.php index 6ad3a84bcac..73553ff6417 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; @@ -387,19 +382,6 @@ class OC { return OC_Config::getValue('session_lifetime', 60 * 60 * 24); } - /** - * @return OC_Router - */ - public static function getRouter() { - if (!isset(OC::$router)) { - OC::$router = new OC_Router(); - OC::$router->loadRoutes(); - } - - return OC::$router; - } - - public static function loadAppClassPaths() { foreach (OC_APP::getEnabledApps() as $app) { $file = OC_App::getAppPath($app) . '/appinfo/classpath.php'; @@ -727,7 +709,7 @@ class OC { OC_App::loadApps(); } self::checkSingleUserMode(); - OC::getRouter()->match(OC_Request::getRawPathInfo()); + OC::$server->getRouter()->match(OC_Request::getRawPathInfo()); return; } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) { //header('HTTP/1.0 404 Not Found'); |