| Index: branches/resourceloader/phase3/includes/ResourceLoader.php |
| — | — | @@ -259,7 +259,7 @@ |
| 260 | 260 | // Calculate the mtime of this request. We need this, 304 or no 304 |
| 261 | 261 | $mtime = 1; |
| 262 | 262 | foreach ( $modules as $name ) { |
| 263 | | - $mtime = max( $mtime, self::getModule( $name )->getmtime( |
| | 263 | + $mtime = max( $mtime, self::getModule( $name )->getModifiedTime( |
| 264 | 264 | $parameters['lang'], $parameters['skin'], $parameters['debug'] |
| 265 | 265 | ) ); |
| 266 | 266 | } |
| Index: branches/resourceloader/phase3/includes/ResourceLoaderModule.php |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | * @param $debug bool Debug mode flag |
| 103 | 103 | * @return int UNIX timestamp |
| 104 | 104 | */ |
| 105 | | - public abstract function getmtime( $lang, $skin, $debug ); |
| | 105 | + public abstract function getModifiedTime( $lang, $skin, $debug ); |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | /** |
| — | — | @@ -334,7 +334,7 @@ |
| 335 | 335 | * @param $debug bool Debug mode flag |
| 336 | 336 | * @return int UNIX timestamp |
| 337 | 337 | */ |
| 338 | | - public function getmtime( $lang, $skin, $debug ) { |
| | 338 | + public function getModifiedTime( $lang, $skin, $debug ) { |
| 339 | 339 | $files = array_merge( $this->scripts, $this->styles, |
| 340 | 340 | $debug ? $this->debugScripts : array(), |
| 341 | 341 | isset( $this->languageScripts[$lang] ) ? (array)$this->languageScripts[$lang] : array(), |
| — | — | @@ -474,7 +474,7 @@ |
| 475 | 475 | return Skin::newFromKey( $skin )->generateUserJs(); |
| 476 | 476 | } |
| 477 | 477 | |
| 478 | | - public function getmtime( $lang, $skin, $debug ) { |
| | 478 | + public function getModifiedTime( $lang, $skin, $debug ) { |
| 479 | 479 | // HACK: We duplicate the message names from generateUserJs() |
| 480 | 480 | // here and weird things (i.e. mtime moving backwards) can happen |
| 481 | 481 | // when a MediaWiki:Something.js page is deleted |