Follow up r83140. Add a clear() method to ObjectCache so that it can be used by ForkC...

diff --git a/includes/ForkController.php b/includes/ForkController.php
index e5b44c2..1cd49e7 100644 (file)
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -115,10 +115,10 @@ class ForkController {
        }
 
        protected function prepareEnvironment() {
-               global $wgCaches, $wgMemc;
+               global $wgMemc;
                // Don't share DB or memcached connections
                wfGetLBFactory()->destroyInstance();
-               $wgCaches = array();
+               ObjectCache::clear();
                unset( $wgMemc );
        }
 

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 5155c0d..118aadf 100644 (file)
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -21,6 +21,13 @@ class ObjectCache {
                return $object;
        }
 
+       /**
+        * Clear all the cached instances.
+        */
+       static function clear() {
+               self::$instances = array();
+       }
+
        /**
         * Create a new cache object of the specified type.
         */