From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 7 Feb 2012 16:49:34 +0000 (+0000)
Subject: Merge r97508 changes to MessageCache.php and Skin.php into trunk
X-Git-Tag: 1.31.0-rc.0~24891
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=fa3ccef8b295a855cc8dd26f5a8eef80cd3319a5;p=lhc%2Fweb%2Fwiklou.git

Merge r97508 changes to MessageCache.php and Skin.php into trunk
---

diff --git a/includes/Skin.php b/includes/Skin.php
index ec6c95e5a4..2774869462 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1178,13 +1178,13 @@ abstract class Skin extends ContextSource {
 	 * @return array
 	 */
 	function buildSidebar() {
-		global $parserMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry;
+		global $wgMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry;
 		wfProfileIn( __METHOD__ );
 
 		$key = wfMemcKey( 'sidebar', $this->getLanguage()->getCode() );
 
 		if ( $wgEnableSidebarCache ) {
-			$cachedsidebar = $parserMemc->get( $key );
+			$cachedsidebar = $wgMemc->get( $key );
 			if ( $cachedsidebar ) {
 				wfProfileOut( __METHOD__ );
 				return $cachedsidebar;
@@ -1196,7 +1196,7 @@ abstract class Skin extends ContextSource {
 
 		wfRunHooks( 'SkinBuildSidebar', array( $this, &$bar ) );
 		if ( $wgEnableSidebarCache ) {
-			$parserMemc->set( $key, $bar, $wgSidebarCacheExpiry );
+			$wgMemc->set( $key, $bar, $wgSidebarCacheExpiry );
 		}
 
 		wfProfileOut( __METHOD__ );
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 59ee8c206d..6b53db0f54 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -499,10 +499,10 @@ class MessageCache {
 			$codes = array_keys( Language::getLanguageNames() );
 		}
 
-		global $parserMemc;
+		global $wgMemc;
 		foreach ( $codes as $code ) {
 			$sidebarKey = wfMemcKey( 'sidebar', $code );
-			$parserMemc->delete( $sidebarKey );
+			$wgMemc->delete( $sidebarKey );
 		}
 
 		// Update the message in the message blob store