diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
commit | d9022f63880ce039446fba8364f68e656b7bf4cb (patch) | |
tree | 16b40fbf17bf7c9ee6f4ead25b16dd192378050a /includes/ForkController.php | |
parent | 27cf83d177256813e2e802241085fce5dd0f3fb9 (diff) |
Update to MediaWiki 1.19.0
Diffstat (limited to 'includes/ForkController.php')
-rw-r--r-- | includes/ForkController.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/ForkController.php b/includes/ForkController.php index d87dfb1e..9cacef54 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,13 +119,13 @@ class ForkController { // Don't share DB or memcached connections wfGetLBFactory()->destroyInstance(); ObjectCache::clear(); - unset( $wgMemc ); + $wgMemc = null; } /** * Fork a number of worker processes. * - * return string + * @return string */ protected function forkWorkers( $numProcs ) { $this->prepareEnvironment(); |