Config flag to disable router caching if needed

2 files changed, 14 insertions, 8 deletions

diff --git a/lib/default.php b/lib/default.php
index 6c8b03927..85d27f522 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -324,4 +324,6 @@ $default =
         array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt')
               'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.)
               ),
+	'router' =>
+	array('cache' => true), // whether to cache the router object. Defaults to true, turn off for devel
         );
diff --git a/lib/router.php b/lib/router.php
index 8d2fbf6cd..fb33125ab 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -127,15 +127,19 @@ class Router
     function __construct()
     {
         if (empty($this->m)) {
-            $k = self::cacheKey();
-            $c = Cache::instance();
-            $m = $c->get($k);
-            if (!empty($m)) {
-                $this->m = $m;
-            } else {
+	    if (!common_config('router', 'cache')) {
                 $this->m = $this->initialize();
-                $c->set($k, $this->m);
-            }
+	    } else {
+		$k = self::cacheKey();
+		$c = Cache::instance();
+		$m = $c->get($k);
+		if (!empty($m)) {
+		    $this->m = $m;
+		} else {
+		    $this->m = $this->initialize();
+		    $c->set($k, $this->m);
+		}
+	    }
         }
     }