From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 15 Jun 2016 04:19:43 +0000 (-0700)
Subject: Simplify and cleanup maxIncludeCacheTime() code
X-Git-Tag: 1.31.0-rc.0~6599^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=fc837f8cc3c05324e9bfd9f7480fa06402ac2ce0

Simplify and cleanup maxIncludeCacheTime() code

* Follow-up to 7730dee6.
* Let subclasses avoid having to check $wgMiserMode themselves.
* Use the Config object instead of global variables.

Change-Id: Ic48f5f5a7ed8e1d04b13922375fb7873adfa0c60
---

diff --git a/includes/specialpage/SpecialPage.php b/includes/specialpage/SpecialPage.php
index 6624414f72..f478203019 100644
--- a/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@ -186,12 +186,14 @@ class SpecialPage {
 	 *  false to use the parent page's cache settings
 	 */
 	public function maxIncludeCacheTime() {
-		global $wgMiserMode;
-		if ( !$wgMiserMode ) {
-			return 0;
-		} else {
-			return 60*60;
-		}
+		return $this->getConfig()->get( 'MiserMode' ) ? $this->getCacheTTL() : 0;
+	}
+
+	/**
+	 * @return int Seconds that this page can be cached
+	 */
+	protected function getCacheTTL() {
+		return 60 * 60;
 	}
 
 	/**
diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index ff9a8990eb..41890f2ca7 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -479,17 +479,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 		return 'changes';
 	}
 
-	/**
-	 * How long to cache page when it is being included.
-	 *
-	 * @return int Time in seconds, 0 to disable caching altogether
-	 */
-	public function maxIncludeCacheTime() {
-		global $wgMiserMode;
-		if ( !$wgMiserMode ) {
-			return 0;
-		} else {
-			return 60*5;
-		}
+	protected function getCacheTTL() {
+		return 60 * 5;
 	}
 }
diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 36ccd4ae4b..00e07bdc8d 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -795,18 +795,8 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		return true;
 	}
 
-	/**
-	 * How long to cache page when it is being included.
-	 *
-	 * @return int|bool Time in seconds, 0 to disable caching altogether
-	 */
-	public function maxIncludeCacheTime() {
-		global $wgMiserMode;
-		if ( !$wgMiserMode ) {
-			return 0;
-		} else {
-			return 60*5;
-		}
+	protected function getCacheTTL() {
+		return 60 * 50;
 	}
 
 }