| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -1002,7 +1002,6 @@ |
| 1003 | 1003 | # Run the parse, protected by a pool counter |
| 1004 | 1004 | wfDebug( __METHOD__ . ": doing uncached parse\n" ); |
| 1005 | 1005 | |
| 1006 | | - $this->checkTouched(); |
| 1007 | 1006 | $key = $parserCache->getKey( $this, $parserOptions ); |
| 1008 | 1007 | $poolArticleView = new PoolWorkArticleView( $this, $key, $useParserCache, $parserOptions ); |
| 1009 | 1008 | |
| Index: trunk/phase3/includes/parser/ParserCache.php |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | function getETag( $article, $popts ) { |
| 68 | 68 | return 'W/"' . $this->getParserOutputKey( $article, |
| 69 | 69 | $popts->optionsHash( ParserOptions::legacyOptions() ) ) . |
| 70 | | - "--" . $article->mTouched . '"'; |
| | 70 | + "--" . $article->getTouched() . '"'; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | /** |
| — | — | @@ -95,10 +95,10 @@ |
| 96 | 96 | // Determine the options which affect this article |
| 97 | 97 | $optionsKey = $this->mMemc->get( $this->getOptionsKey( $article ) ); |
| 98 | 98 | if ( $optionsKey != false ) { |
| 99 | | - if ( !$useOutdated && $optionsKey->expired( $article->mTouched ) ) { |
| | 99 | + if ( !$useOutdated && $optionsKey->expired( $article->getTouched() ) ) { |
| 100 | 100 | wfIncrStats( "pcache_miss_expired" ); |
| 101 | 101 | $cacheTime = $optionsKey->getCacheTime(); |
| 102 | | - wfDebug( "Parser options key expired, touched {$article->mTouched}, epoch $wgCacheEpoch, cached $cacheTime\n" ); |
| | 102 | + wfDebug( "Parser options key expired, touched " . $article->getTouched() . ", epoch $wgCacheEpoch, cached $cacheTime\n" ); |
| 103 | 103 | return false; |
| 104 | 104 | } |
| 105 | 105 | |
| — | — | @@ -128,8 +128,7 @@ |
| 129 | 129 | return false; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | | - // Having called checkTouched() ensures this will be loaded |
| 133 | | - $touched = $article->mTouched; |
| | 132 | + $touched = $article->getTouched(); |
| 134 | 133 | |
| 135 | 134 | $parserOutputKey = $this->getKey( $article, $popts, $useOutdated ); |
| 136 | 135 | if ( $parserOutputKey === false ) { |