From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 20 Dec 2011 04:39:12 +0000 (+0000)
Subject: * Fix class name
X-Git-Tag: 1.31.0-rc.0~25885
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=2ba6b03e8e420ef34365516c0e962fddc4858132;p=lhc%2Fweb%2Fwiklou.git

* Fix class name
* unset($wgMemc) doesn't actually do anything useful, it just removes the reference from the local scope. Set it to NULL instead.
---

diff --git a/includes/ForkController.php b/includes/ForkController.php
index 7fff6aee5a..9cacef5497 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -34,7 +34,7 @@ class ForkController {
 
 	public function __construct( $numProcs, $flags = 0 ) {
 		if ( php_sapi_name() != 'cli' ) {
-			throw new MWException( "MultiProcess cannot be used from the web." );
+			throw new MWException( "ForkController cannot be used from the web." );
 		}
 		$this->procsToStart = $numProcs;
 		$this->flags = $flags;
@@ -119,7 +119,7 @@ class ForkController {
 		// Don't share DB or memcached connections
 		wfGetLBFactory()->destroyInstance();
 		ObjectCache::clear();
-		unset( $wgMemc );
+		$wgMemc = null;
 	}
 
 	/**