From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 2 May 2016 14:42:29 +0000 (+0000)
Subject: Merge "In ParserCache, respect $useOutdated"
X-Git-Tag: 1.31.0-rc.0~7134
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=086fd2799fd388ae7d93c90bb3aec6a59ba07cf5;p=lhc%2Fweb%2Fwiklou.git

Merge "In ParserCache, respect $useOutdated"
---

086fd2799fd388ae7d93c90bb3aec6a59ba07cf5
diff --cc includes/parser/ParserCache.php
index 5876e0b258,8d626db7a5..21486ff7aa
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@@ -146,11 -146,10 +146,11 @@@ 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();
@@@ -226,11 -222,10 +226,11 @@@
  		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();