From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 includes/ForkController.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'includes/ForkController.php')

diff --git a/includes/ForkController.php b/includes/ForkController.php
index e5b44c2b..d87dfb1e 100644
--- a/includes/ForkController.php
+++ b/includes/ForkController.php
@@ -115,15 +115,17 @@ 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 ) {
 		$this->prepareEnvironment();
-- 
cgit v1.2.2