https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114102
Revision: 114102
Author: jeroendedauw
Date: 2012-03-18 17:39:29 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
follow up to r114082, match rename
Modified Paths:
--------------
trunk/extensions/EducationProgram/compat/SpecialCachedPage.php
Modified: trunk/extensions/EducationProgram/compat/SpecialCachedPage.php
===================================================================
--- trunk/extensions/EducationProgram/compat/SpecialCachedPage.php
2012-03-18 16:27:37 UTC (rev 114101)
+++ trunk/extensions/EducationProgram/compat/SpecialCachedPage.php
2012-03-18 17:39:29 UTC (rev 114102)
@@ -56,8 +56,6 @@
* @param string|null $subPage
*/
public function execute( $subPage ) {
- //parent::execute( $subPage );
-
if ( $this->getRequest()->getText( 'action' ) === 'purge' ) {
$this->hasCached = false;
}
@@ -110,7 +108,7 @@
/**
* Returns a message with the time to live of the cache.
- * Takes care of compatibility with MW < 1.20, in which
Language::duration was introduced.
+ * Takes care of compatibility with MW < 1.20, in which
Language::formatDuration was introduced.
*
* @since 0.1
*
@@ -120,8 +118,8 @@
* @return string
*/
protected function getDurationText( $seconds, array $chosenIntervals =
array( 'years', 'days', 'hours', 'minutes', 'seconds' ) ) {
- if ( method_exists( $this->getLanguage(), 'duration' ) ) {
- return $this->getLanguage()->duration( $seconds,
$chosenIntervals );
+ if ( method_exists( $this->getLanguage(), 'formatDuration' ) ) {
+ return $this->getLanguage()->formatDuration( $seconds,
$chosenIntervals );
}
else {
$intervals = array(
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
