merge 0.9.x into 1.0.x

2011-05-04 14:59:39 -07:00
parent 7e1ae44fad 753bc7302a
commit c97048d01b
13 changed files with 318 additions and 68 deletions
--- 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)) {