Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify and cleanup maxIncludeCacheTime() code

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

Change-Id: Ic48f5f5a7ed8e1d04b13922375fb7873adfa0c60
This commit is contained in:
Aaron Schulz 2016-06-14 21:19:43 -07:00
parent 7730dee63b
commit fc837f8cc3
3 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
includes/specialpage/SpecialPage.php
View file

@ -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;
}
/**

14
includes/specials/SpecialNewpages.php
View file

@ -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;
}
}

14
includes/specials/SpecialRecentchanges.php
View file

@ -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;
}
}