From 6ba2623485655460440a972e34a8a2a2fda02821 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 2 Aug 2012 17:59:18 +0200
Subject: [PATCH] Move loading of routes to OC::getRouter function
---
lib/base.php | 1 +
lib/router.php | 7 ++++++-
ocs/v1.php | 1 -
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index 43588944d0..0d9ececc0c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -278,6 +278,7 @@ class OC{
public static function getRouter() {
if (!isset(OC::$router)) {
OC::$router = new OC_Router();
+ OC::$router->loadRoutes();
}
return OC::$router;
diff --git a/lib/router.php b/lib/router.php
index c3864cfc91..5c5171cf82 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -16,10 +16,15 @@ class OC_Router {
protected $collections = array();
protected $collection = null;
+ public function __construct() {
+ // TODO cache
+ $this->loadRoutes();
+ }
+
/**
* loads the api routes
*/
- public function loadRoutes(){
+ public function loadRoutes() {
// TODO cache
foreach(OC_APP::getEnabledApps() as $app){
$file = OC_App::getAppPath($app).'/appinfo/routes.php';
diff --git a/ocs/v1.php b/ocs/v1.php
index cb8a1faf87..938a57009f 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -26,7 +26,6 @@ use Symfony\Component\Routing\Exception\ResourceNotFoundException;
use Symfony\Component\Routing\Exception\MethodNotAllowedException;
OC::getRouter()->useCollection('ocs');
-OC::getRouter()->loadRoutes();
try {
OC::getRouter()->match($_SERVER['PATH_INFO']);
--
GitLab