merge 0.9.x into 1.0.x

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

diff --git a/lib/router.php b/lib/router.php
index a155c523724cf4c1d573bee5ffcf27036f5e908c..9ba80515224f6edaed3db2547ce406e87387749e 100644 (file)
--- a/lib/router.php
+++ b/lib/router.php
@@ -126,6 +126,15 @@ class Router
         return Router::$inst;
     }
 
+    /**
+     * Clear the global singleton instance for this class.
+     * Needed to ensure reset when switching site configurations.
+     */
+    static function clear()
+    {
+        Router::$inst = null;
+    }
+
     function __construct()
     {
         if (empty($this->m)) {