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

diff --git a/includes/Skin.php b/includes/Skin.php
index ec6c95e..2774869 100644 (file)
--- 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 59ee8c2..6b53db0 100644 (file)
--- 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