| Index: branches/wmf/1.18wmf1/includes/Setup.php |
| — | — | @@ -416,11 +416,11 @@ |
| 417 | 417 | |
| 418 | 418 | if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) { |
| 419 | 419 | if ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix . 'Token'] ) ) { |
| 420 | | - wfIncrStats( 'request_with_session' ); |
| | 420 | + # wfIncrStats( 'request_with_session' ); |
| 421 | 421 | wfSetupSession(); |
| 422 | 422 | $wgSessionStarted = true; |
| 423 | 423 | } else { |
| 424 | | - wfIncrStats( 'request_without_session' ); |
| | 424 | + # wfIncrStats( 'request_without_session' ); |
| 425 | 425 | $wgSessionStarted = false; |
| 426 | 426 | } |
| 427 | 427 | } |
| — | — | @@ -449,7 +449,10 @@ |
| 450 | 450 | /** |
| 451 | 451 | * @var Parser |
| 452 | 452 | */ |
| 453 | | -$wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) ); |
| | 453 | +#$wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) ); |
| | 454 | +# Live hack to clear up profiling -- TS |
| | 455 | +$class = $wgParserConf['class']; |
| | 456 | +$wgParser = new $class( $wgParserConf ); |
| 454 | 457 | |
| 455 | 458 | if ( !is_object( $wgAuth ) ) { |
| 456 | 459 | $wgAuth = new StubObject( 'wgAuth', 'AuthPlugin' ); |
| Index: branches/wmf/1.18wmf1/includes/cache/MessageCache.php |
| — | — | @@ -457,10 +457,10 @@ |
| 458 | 458 | $codes = array_keys( Language::getLanguageNames() ); |
| 459 | 459 | } |
| 460 | 460 | |
| 461 | | - global $parserMemc; |
| | 461 | + global $wgMemc; |
| 462 | 462 | foreach ( $codes as $code ) { |
| 463 | 463 | $sidebarKey = wfMemcKey( 'sidebar', $code ); |
| 464 | | - $parserMemc->delete( $sidebarKey ); |
| | 464 | + $wgMemc->delete( $sidebarKey ); |
| 465 | 465 | } |
| 466 | 466 | |
| 467 | 467 | // Update the message in the message blob store |
| Index: branches/wmf/1.18wmf1/includes/Skin.php |
| — | — | @@ -1179,13 +1179,13 @@ |
| 1180 | 1180 | * @return array |
| 1181 | 1181 | */ |
| 1182 | 1182 | function buildSidebar() { |
| 1183 | | - global $parserMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry; |
| | 1183 | + global $wgMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry; |
| 1184 | 1184 | wfProfileIn( __METHOD__ ); |
| 1185 | 1185 | |
| 1186 | 1186 | $key = wfMemcKey( 'sidebar', $this->getLang()->getCode() ); |
| 1187 | 1187 | |
| 1188 | 1188 | if ( $wgEnableSidebarCache ) { |
| 1189 | | - $cachedsidebar = $parserMemc->get( $key ); |
| | 1189 | + $cachedsidebar = $wgMemc->get( $key ); |
| 1190 | 1190 | if ( $cachedsidebar ) { |
| 1191 | 1191 | wfProfileOut( __METHOD__ ); |
| 1192 | 1192 | return $cachedsidebar; |
| — | — | @@ -1197,7 +1197,7 @@ |
| 1198 | 1198 | |
| 1199 | 1199 | wfRunHooks( 'SkinBuildSidebar', array( $this, &$bar ) ); |
| 1200 | 1200 | if ( $wgEnableSidebarCache ) { |
| 1201 | | - $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry ); |
| | 1201 | + $wgMemc->set( $key, $bar, $wgSidebarCacheExpiry ); |
| 1202 | 1202 | } |
| 1203 | 1203 | |
| 1204 | 1204 | wfProfileOut( __METHOD__ ); |