X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fparser%2FParserCache.php;h=dae0c68ae36b763d179518165f91a8f37ab996ec;hb=247b8ede254681535a8020f9cf1ab164ce0bd9f6;hp=7043b4a9603fd52fcb6a757952d6023b3042688e;hpb=aa5e15357aab7365815c154fd86bdaa6f968b97a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index 7043b4a960..dae0c68ae3 100644
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -27,8 +27,6 @@
  */
 class ParserCache {
 	private $mMemc;
-	const try116cache = false; /* Only useful $wgParserCacheExpireTime after updating to 1.17 */
-
 	/**
 	 * Get an instance of this object
 	 *
@@ -146,7 +144,7 @@ class ParserCache {
 			$usedOptions = $optionsKey->mUsedOptions;
 			wfDebug( "Parser cache options found.\n" );
 		} else {
-			if ( !$useOutdated && !self::try116cache ) {
+			if ( !$useOutdated ) {
 				return false;
 			}
 			$usedOptions = ParserOptions::legacyOptions();
@@ -186,12 +184,6 @@ class ParserCache {
 		}
 
 		$value = $this->mMemc->get( $parserOutputKey );
-		if ( self::try116cache && !$value && strpos( $value, '*' ) !== -1 ) {
-			wfDebug( "New format parser cache miss.\n" );
-			$parserOutputKey = $this->getParserOutputKey( $article,
-				$popts->optionsHash( ParserOptions::legacyOptions(), $article->getTitle() ) );
-			$value = $this->mMemc->get( $parserOutputKey );
-		}
 		if ( !$value ) {
 			wfDebug( "ParserOutput cache miss.\n" );
 			wfIncrStats( "pcache_miss_absent" );