From d39cc0e88575e96d8dcc7688b4d751d81293a260 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Fri, 25 Jan 2019 21:05:21 -0800
Subject: [PATCH] Remove deprecated wgEnableParserCache

One less thing to do in Setup.php.

Bug: T189966
Change-Id: Ie9b631897fda51f6db9fc4d634bcbd6bf865dfc9
---
 RELEASE-NOTES-1.33           | 3 +++
 includes/DefaultSettings.php | 6 ------
 includes/Setup.php           | 4 ----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/RELEASE-NOTES-1.33 b/RELEASE-NOTES-1.33
index 03a4a67387..ad343a229d 100644
--- a/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@ -30,6 +30,9 @@ production.
   $wgTidyConf, $wgTidyOpts, $wgTidyInternal, and $wgDebugTidy, all
   deprecated since 1.26, have now all been removed. The $wgTidyConfig
   setting remains only for Remex experimental features or debugging.
+* $wgEnableParserCache, deprecated since 1.26, was removed.
+  If disabling the parser cache is still desirable,
+  set `$wgParserCacheType = CACHE_NONE;` instead.
 
 === New features in 1.33 ===
 * (T96041) __EXPECTUNUSEDCATEGORY__ on a category page causes the category
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9df4ab67f0..00ccc960f3 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2660,12 +2660,6 @@ $wgUseFileCache = false;
  */
 $wgFileCacheDepth = 2;
 
-/**
- * Kept for extension compatibility; see $wgParserCacheType
- * @deprecated since 1.26
- */
-$wgEnableParserCache = true;
-
 /**
  * Append a configured value to the parser cache and the sitenotice key so
  * that they can be kept separate for some class of activity.
diff --git a/includes/Setup.php b/includes/Setup.php
index 4ebe426b0a..23342e934e 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -194,10 +194,6 @@ if ( $wgGitInfoCacheDirectory === false && $wgCacheDirectory !== false ) {
 	$wgGitInfoCacheDirectory = "{$wgCacheDirectory}/gitinfo";
 }
 
-if ( $wgEnableParserCache === false ) {
-	$wgParserCacheType = CACHE_NONE;
-}
-
 // Fix path to icon images after they were moved in 1.24
 if ( $wgRightsIcon ) {
 	$wgRightsIcon = str_replace(
-- 
2.20.1