Merge branch 'twitter-bridge-fixes'

[quix0rs-gnu-social.git] / lib / router.php

diff --git a/lib/router.php b/lib/router.php
index 8fbb6eb1f43ff7ae4478e6b7dc686e5ddf6f5f5a..606b30e91640dc53930183a1c0f2225351b0c4ef 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -69,19 +69,7 @@ class Router
     function __construct()
     {
         if (empty($this->m)) {
-            if (!common_config('router', 'cache')) {
-                $this->m = $this->initialize();
-            } 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);
-                }
-            }
+            $this->m = $this->initialize();
         }
     }