| Index: trunk/extensions/EducationProgram/compat/SpecialCachedPage.php |
| — | — | @@ -56,8 +56,6 @@ |
| 57 | 57 | * @param string|null $subPage |
| 58 | 58 | */ |
| 59 | 59 | public function execute( $subPage ) { |
| 60 | | - //parent::execute( $subPage ); |
| 61 | | - |
| 62 | 60 | if ( $this->getRequest()->getText( 'action' ) === 'purge' ) { |
| 63 | 61 | $this->hasCached = false; |
| 64 | 62 | } |
| — | — | @@ -110,7 +108,7 @@ |
| 111 | 109 | |
| 112 | 110 | /** |
| 113 | 111 | * Returns a message with the time to live of the cache. |
| 114 | | - * Takes care of compatibility with MW < 1.20, in which Language::duration was introduced. |
| | 112 | + * Takes care of compatibility with MW < 1.20, in which Language::formatDuration was introduced. |
| 115 | 113 | * |
| 116 | 114 | * @since 0.1 |
| 117 | 115 | * |
| — | — | @@ -120,8 +118,8 @@ |
| 121 | 119 | * @return string |
| 122 | 120 | */ |
| 123 | 121 | protected function getDurationText( $seconds, array $chosenIntervals = array( 'years', 'days', 'hours', 'minutes', 'seconds' ) ) { |
| 124 | | - if ( method_exists( $this->getLanguage(), 'duration' ) ) { |
| 125 | | - return $this->getLanguage()->duration( $seconds, $chosenIntervals ); |
| | 122 | + if ( method_exists( $this->getLanguage(), 'formatDuration' ) ) { |
| | 123 | + return $this->getLanguage()->formatDuration( $seconds, $chosenIntervals ); |
| 126 | 124 | } |
| 127 | 125 | else { |
| 128 | 126 | $intervals = array( |