Merge branch '0.9.x' into 1.0.x

Conflicts: plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
2010-12-16 15:56:19 -08:00
parent bf20258f4b f901c25012
commit e79034e163
1104 changed files with 24017 additions and 10823 deletions
--- a/lib/router.php
+++ b/lib/router.php
@@ -160,7 +160,16 @@ class Router
    
    static function cacheKey()
    {
-        return Cache::codeKey('router');
+        $parts = array('router');
+
+        // Many router paths depend on this setting.
+        if (common_config('singleuser', 'enabled')) {
+            $parts[] = '1user';
+        } else {
+            $parts[] = 'multi';
+        }
+
+        return Cache::codeKey(implode(':', $parts));
    }
    
    function initialize()