Revert r104659 and its followup r104665: break the unit tests with a fatal error...

[lhc/web/wiklou.git] / includes / ForkController.php

diff --git a/includes/ForkController.php b/includes/ForkController.php
index 7b88922..7fff6ae 100644 (file)
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -115,19 +115,19 @@ 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 );
        }
 
        /**
         * Fork a number of worker processes.
+        *
+        * @return string
         */
        protected function forkWorkers( $numProcs ) {
-               global $wgMemc, $wgCaches, $wgMainCacheType;
-
                $this->prepareEnvironment();
 
                // Create the child processes