Provisional workaround for router inconsistencies in background processes that switch...

Ensure that router is cleared when we do site setup; we can still fetch the data from cache, so it should stay fast, but should ensure that we don't end up with someone else's routes still set up, which may be an issue breaking some of the bookmark handling that needs routing with a rare plugin.

diff --git a/lib/router.php b/lib/router.php
index e956b02c631067f56c2aaa01397cbb23a54b7fdd..e3a9203e4d9e53cf4f0ee2baede18d5f9e7da098 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)) {

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 85b46bbb3fed09904a31878c5f91caa01f5fd495..2c38fc205ff82ade63aa5d08af239affd01f3342 100644 (file)
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -107,6 +107,8 @@ class StatusNet
      */
     public static function init($server=null, $path=null, $conffile=null)
     {
+        Router::clear();
+
         StatusNet::initDefaults($server, $path);
         StatusNet::loadConfigFile($conffile);