| Index: trunk/phase3/includes/parser/ParserCache.php |
| — | — | @@ -78,6 +78,11 @@ |
| 79 | 79 | public function getKey( $article, $popts, $useOutdated = true ) { |
| 80 | 80 | global $wgCacheEpoch; |
| 81 | 81 | |
| | 82 | + if( $popts instanceof User ) { |
| | 83 | + wfDebug( "Use of outdated prototype ParserCache::getKey( &\$article, &\$user )\n" ); |
| | 84 | + $popts = ParserOptions::newFromUser( $popts ); |
| | 85 | + } |
| | 86 | + |
| 82 | 87 | // Determine the options which affect this article |
| 83 | 88 | $optionsKey = $this->mMemc->get( $this->getOptionsKey( $article ) ); |
| 84 | 89 | if ( $optionsKey != false ) { |
| — | — | @@ -135,6 +140,7 @@ |
| 136 | 141 | |
| 137 | 142 | if ( !$useOutdated && $value->expired( $touched ) ) { |
| 138 | 143 | wfIncrStats( "pcache_miss_expired" ); |
| | 144 | + $cacheTime = $value->getCacheTime(); |
| 139 | 145 | wfDebug( "ParserOutput key expired, touched $touched, epoch $wgCacheEpoch, cached $cacheTime\n" ); |
| 140 | 146 | $value = false; |
| 141 | 147 | } else { |