| Index: branches/wmf/1.17wmf1/includes/MessageCache.php |
| — | — | @@ -407,7 +407,7 @@ |
| 408 | 408 | $this->unlock($cacheKey); |
| 409 | 409 | |
| 410 | 410 | // Also delete cached sidebar... just in case it is affected |
| 411 | | - global $parserMemc; |
| | 411 | + global $wgMemc; |
| 412 | 412 | $codes = array( $code ); |
| 413 | 413 | if ( $code === 'en' ) { |
| 414 | 414 | // Delete all sidebars, like for example on action=purge on the |
| — | — | @@ -417,7 +417,7 @@ |
| 418 | 418 | |
| 419 | 419 | foreach ( $codes as $code ) { |
| 420 | 420 | $sidebarKey = wfMemcKey( 'sidebar', $code ); |
| 421 | | - $parserMemc->delete( $sidebarKey ); |
| | 421 | + $wgMemc->delete( $sidebarKey ); |
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | // Update the message in the message blob store |
| Index: branches/wmf/1.17wmf1/includes/Skin.php |
| — | — | @@ -2181,14 +2181,14 @@ |
| 2182 | 2182 | * @return array |
| 2183 | 2183 | */ |
| 2184 | 2184 | function buildSidebar() { |
| 2185 | | - global $parserMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry; |
| | 2185 | + global $wgMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry; |
| 2186 | 2186 | global $wgLang; |
| 2187 | 2187 | wfProfileIn( __METHOD__ ); |
| 2188 | 2188 | |
| 2189 | 2189 | $key = wfMemcKey( 'sidebar', $wgLang->getCode() ); |
| 2190 | 2190 | |
| 2191 | 2191 | if ( $wgEnableSidebarCache ) { |
| 2192 | | - $cachedsidebar = $parserMemc->get( $key ); |
| | 2192 | + $cachedsidebar = $wgMemc->get( $key ); |
| 2193 | 2193 | if ( $cachedsidebar ) { |
| 2194 | 2194 | wfProfileOut( __METHOD__ ); |
| 2195 | 2195 | return $cachedsidebar; |
| — | — | @@ -2200,7 +2200,7 @@ |
| 2201 | 2201 | |
| 2202 | 2202 | wfRunHooks( 'SkinBuildSidebar', array( $this, &$bar ) ); |
| 2203 | 2203 | if ( $wgEnableSidebarCache ) { |
| 2204 | | - $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry ); |
| | 2204 | + $wgMemc->set( $key, $bar, $wgSidebarCacheExpiry ); |
| 2205 | 2205 | } |
| 2206 | 2206 | |
| 2207 | 2207 | wfProfileOut( __METHOD__ ); |