From 3006f76fdf6c9856151e9b7b3e3b6f8910071fb9 Mon Sep 17 00:00:00 2001 From: tonythomas01 <01tonythomas@gmail.com> Date: Tue, 31 Dec 2013 00:24:29 +0530 Subject: [PATCH] Removed const ParserCache::try116cache Version 1.16 is long ago and there seems no need to keep the const ParserCache::try116cache in core. Removed the if(self:: try116cache) block Bug: 59127 Change-Id: I705a056665441f81516a4dbb6fe317a44da91d43 --- includes/parser/ParserCache.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php index 7043b4a960..bad04825a3 100644 --- a/includes/parser/ParserCache.php +++ b/includes/parser/ParserCache.php @@ -27,8 +27,7 @@ */ class ParserCache { private $mMemc; - const try116cache = false; /* Only useful $wgParserCacheExpireTime after updating to 1.17 */ - + /** * Get an instance of this object * @@ -146,7 +145,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 +185,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" ); -- 2.20.1