| Index: trunk/phase3/includes/cache/MessageCache.php |
| — | — | @@ -499,10 +499,10 @@ |
| 500 | 500 | $codes = array_keys( Language::getLanguageNames() ); |
| 501 | 501 | } |
| 502 | 502 | |
| 503 | | - global $parserMemc; |
| | 503 | + global $wgMemc; |
| 504 | 504 | foreach ( $codes as $code ) { |
| 505 | 505 | $sidebarKey = wfMemcKey( 'sidebar', $code ); |
| 506 | | - $parserMemc->delete( $sidebarKey ); |
| | 506 | + $wgMemc->delete( $sidebarKey ); |
| 507 | 507 | } |
| 508 | 508 | |
| 509 | 509 | // Update the message in the message blob store |
| Property changes on: trunk/phase3/includes/cache/MessageCache.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 510 | 510 | Merged /branches/wmf/1.18wmf1/includes/cache/MessageCache.php:r97508 |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1178,13 +1178,13 @@ |
| 1179 | 1179 | * @return array |
| 1180 | 1180 | */ |
| 1181 | 1181 | function buildSidebar() { |
| 1182 | | - global $parserMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry; |
| | 1182 | + global $wgMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry; |
| 1183 | 1183 | wfProfileIn( __METHOD__ ); |
| 1184 | 1184 | |
| 1185 | 1185 | $key = wfMemcKey( 'sidebar', $this->getLanguage()->getCode() ); |
| 1186 | 1186 | |
| 1187 | 1187 | if ( $wgEnableSidebarCache ) { |
| 1188 | | - $cachedsidebar = $parserMemc->get( $key ); |
| | 1188 | + $cachedsidebar = $wgMemc->get( $key ); |
| 1189 | 1189 | if ( $cachedsidebar ) { |
| 1190 | 1190 | wfProfileOut( __METHOD__ ); |
| 1191 | 1191 | return $cachedsidebar; |
| — | — | @@ -1196,7 +1196,7 @@ |
| 1197 | 1197 | |
| 1198 | 1198 | wfRunHooks( 'SkinBuildSidebar', array( $this, &$bar ) ); |
| 1199 | 1199 | if ( $wgEnableSidebarCache ) { |
| 1200 | | - $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry ); |
| | 1200 | + $wgMemc->set( $key, $bar, $wgSidebarCacheExpiry ); |
| 1201 | 1201 | } |
| 1202 | 1202 | |
| 1203 | 1203 | wfProfileOut( __METHOD__ ); |
| Property changes on: trunk/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1204 | 1204 | Merged /branches/wmf/1.18wmf1/includes:r97508 |
| Property changes on: trunk/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1205 | 1205 | Merged /branches/wmf/1.18wmf1:r97508 |