From 4111ff0dc3fc0ce7a4271f2b1337bdc0d4be25eb Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sun, 15 Feb 2015 14:41:49 -0800
Subject: [PATCH] Removed obsolete "containsOldMagic" code

Change-Id: Id225347e0599a6f79b30b0793cce7d97daed46f2
---
 includes/OutputPage.php                      |  6 ------
 includes/parser/CacheTime.php                | 20 --------------------
 includes/parser/ParserCache.php              |  2 --
 includes/parser/ParserOutput.php             |  3 +--
 includes/poolcounter/PoolWorkArticleView.php |  2 +-
 5 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 5c146e4d25..407082202b 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -196,12 +196,6 @@ class OutputPage extends ContextSource {
 
 	// Parser related.
 
-	/**
-	 * @var int
-	 * @todo Unused?
-	 */
-	private $mContainsOldMagic = 0;
-
 	/** @var int */
 	protected $mContainsNewMagic = 0;
 
diff --git a/includes/parser/CacheTime.php b/includes/parser/CacheTime.php
index e382cf3b81..950c0d46df 100644
--- a/includes/parser/CacheTime.php
+++ b/includes/parser/CacheTime.php
@@ -35,7 +35,6 @@ class CacheTime {
 	public $mVersion = Parser::VERSION,  # Compatibility check
 		$mCacheTime = '',             # Time when this object was generated, or -1 for uncacheable. Used in ParserCache.
 		$mCacheExpiry = null,         # Seconds after which the object should expire, use 0 for uncacheable. Used in ParserCache.
-		$mContainsOldMagic,           # Boolean variable indicating if the input contained variables like {{CURRENTDAY}}
 		$mCacheRevisionId = null;     # Revision ID that was parsed
 
 	/**
@@ -45,21 +44,6 @@ class CacheTime {
 		return wfTimestamp( TS_MW, $this->mCacheTime );
 	}
 
-	/**
-	 * @return bool
-	 */
-	public function containsOldMagic() {
-		return $this->mContainsOldMagic;
-	}
-
-	/**
-	 * @param bool $com
-	 * @return bool
-	 */
-	public function setContainsOldMagic( $com ) {
-		return wfSetVar( $this->mContainsOldMagic, $com );
-	}
-
 	/**
 	 * setCacheTime() sets the timestamp expressing when the page has been rendered.
 	 * This does not control expiry, see updateCacheExpiry() for that!
@@ -133,10 +117,6 @@ class CacheTime {
 			$expire = min( $expire, $wgParserCacheExpireTime );
 		}
 
-		if ( $this->containsOldMagic() ) { //compatibility hack
-			$expire = min( $expire, 3600 ); # 1 hour
-		}
-
 		if ( $expire <= 0 ) {
 			return 0; // not cacheable
 		} else {
diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index ad131f4a92..bc8e4a6993 100644
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -257,8 +257,6 @@ class ParserCache {
 			$optionsKey->setCacheRevisionId( $revId );
 			$parserOutput->setCacheRevisionId( $revId );
 
-			$optionsKey->setContainsOldMagic( $parserOutput->containsOldMagic() );
-
 			$parserOutputKey = $this->getParserOutputKey( $page,
 				$popts->optionsHash( $optionsKey->mUsedOptions, $page->getTitle() ) );
 
diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php
index e9e72beca8..94465741f5 100644
--- a/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@ -64,12 +64,11 @@ class ParserOutput extends CacheTime {
 		'#<(?:mw:)?editsection page="(.*?)" section="(.*?)"(?:/>|>(.*?)(</(?:mw:)?editsection>))#';
 
 	public function __construct( $text = '', $languageLinks = array(), $categoryLinks = array(),
-		$containsOldMagic = false, $titletext = ''
+		$unused = false, $titletext = ''
 	) {
 		$this->mText = $text;
 		$this->mLanguageLinks = $languageLinks;
 		$this->mCategories = $categoryLinks;
-		$this->mContainsOldMagic = $containsOldMagic;
 		$this->mTitleText = $titletext;
 	}
 
diff --git a/includes/poolcounter/PoolWorkArticleView.php b/includes/poolcounter/PoolWorkArticleView.php
index da20f94159..2c67b56d8c 100644
--- a/includes/poolcounter/PoolWorkArticleView.php
+++ b/includes/poolcounter/PoolWorkArticleView.php
@@ -154,7 +154,7 @@ class PoolWorkArticleView extends PoolCounterWork {
 		// Make sure file cache is not used on uncacheable content.
 		// Output that has magic words in it can still use the parser cache
 		// (if enabled), though it will generally expire sooner.
-		if ( !$this->parserOutput->isCacheable() || $this->parserOutput->containsOldMagic() ) {
+		if ( !$this->parserOutput->isCacheable() ) {
 			$wgUseFileCache = false;
 		}
 
-- 
2.20.1