| Index: branches/wmf/1.17wmf1/includes/GlobalFunctions.php |
| — | — | @@ -2148,7 +2148,7 @@ |
| 2149 | 2149 | } |
| 2150 | 2150 | |
| 2151 | 2151 | function wfGetCachedNotice( $name ) { |
| 2152 | | - global $wgOut, $wgRenderHashAppend, $parserMemc; |
| | 2152 | + global $wgOut, $wgRenderHashAppend, $wgMemc; |
| 2153 | 2153 | $fname = 'wfGetCachedNotice'; |
| 2154 | 2154 | wfProfileIn( $fname ); |
| 2155 | 2155 | |
| — | — | @@ -2172,7 +2172,7 @@ |
| 2173 | 2173 | |
| 2174 | 2174 | // Use the extra hash appender to let eg SSL variants separately cache. |
| 2175 | 2175 | $key = wfMemcKey( $name . $wgRenderHashAppend ); |
| 2176 | | - $cachedNotice = $parserMemc->get( $key ); |
| | 2176 | + $cachedNotice = $wgMemc->get( $key ); |
| 2177 | 2177 | if( is_array( $cachedNotice ) ) { |
| 2178 | 2178 | if( md5( $notice ) == $cachedNotice['hash'] ) { |
| 2179 | 2179 | $notice = $cachedNotice['html']; |
| — | — | @@ -2186,7 +2186,7 @@ |
| 2187 | 2187 | if( $needParse ) { |
| 2188 | 2188 | if( is_object( $wgOut ) ) { |
| 2189 | 2189 | $parsed = $wgOut->parse( $notice ); |
| 2190 | | - $parserMemc->set( $key, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 ); |
| | 2190 | + $wgMemc->set( $key, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 ); |
| 2191 | 2191 | $notice = $parsed; |
| 2192 | 2192 | } else { |
| 2193 | 2193 | wfDebug( 'wfGetCachedNotice called for ' . $name . ' with no $wgOut available' . "\n" ); |