Merge "In ParserCache, respect $useOutdated"

diff --combined includes/parser/ParserCache.php
index 5876e0b,8d626db..21486ff
--- 1/includes/parser/ParserCache.php
--- 2/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@@ -146,17 -146,14 +146,17 @@@ class ParserCache 
                        if ( !$useOutdated && $optionsKey->expired( $article->getTouched() ) ) {
                                wfIncrStats( "pcache.miss.expired" );
                                $cacheTime = $optionsKey->getCacheTime();
 -                              wfDebug( "Parser options key expired, touched " . $article->getTouched()
 +                              wfDebugLog( "ParserCache",
 +                                      "Parser options key expired, touched " . $article->getTouched()
                                        . ", epoch $wgCacheEpoch, cached $cacheTime\n" );
                                return false;
-                       } elseif ( $optionsKey->isDifferentRevision( $article->getLatest() ) ) {
+                       } elseif ( !$useOutdated && $optionsKey->isDifferentRevision( $article->getLatest() ) ) {
                                wfIncrStats( "pcache.miss.revid" );
                                $revId = $article->getLatest();
                                $cachedRevId = $optionsKey->getCacheRevisionId();
 -                              wfDebug( "ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n" );
 +                              wfDebugLog( "ParserCache",
 +                                      "ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n"
 +                              );
                                return false;
                        }
  
@@@ -204,7 -201,6 +204,7 @@@
                }
  
                $casToken = null;
 +              /** @var ParserOutput $value */
                $value = $this->mMemc->get( $parserOutputKey, $casToken, BagOStuff::READ_VERIFIED );
                if ( !$value ) {
                        wfDebug( "ParserOutput cache miss.\n" );
@@@ -226,15 -222,14 +226,15 @@@
                if ( !$useOutdated && $value->expired( $touched ) ) {
                        wfIncrStats( "pcache.miss.expired" );
                        $cacheTime = $value->getCacheTime();
 -                      wfDebug( "ParserOutput key expired, touched $touched, "
 +                      wfDebugLog( "ParserCache",
 +                              "ParserOutput key expired, touched $touched, "
                                . "epoch $wgCacheEpoch, cached $cacheTime\n" );
                        $value = false;
-               } elseif ( $value->isDifferentRevision( $article->getLatest() ) ) {
+               } elseif ( !$useOutdated && $value->isDifferentRevision( $article->getLatest() ) ) {
                        wfIncrStats( "pcache.miss.revid" );
                        $revId = $article->getLatest();
                        $cachedRevId = $value->getCacheRevisionId();
 -                      wfDebug(
 +                      wfDebugLog( "ParserCache",
                                "ParserOutput key is for an old revision, latest $revId, cached $cachedRevId\n"
                        );
                        $value = false;
@@@ -242,7 -237,7 +242,7 @@@
                        Hooks::run( 'RejectParserCacheValue', [ $value, $wikiPage, $popts ] ) === false
                ) {
                        wfIncrStats( 'pcache.miss.rejected' );
 -                      wfDebug(
 +                      wfDebugLog( "ParserCache",
                                "ParserOutput key valid, but rejected by RejectParserCacheValue hook handler.\n"
                        );
                        $value = false;