| Index: branches/resourceloader/phase3/includes/ResourceLoaderModule.php |
| — | — | @@ -582,12 +582,21 @@ |
| 583 | 583 | |
| 584 | 584 | |
| 585 | 585 | class ResourceLoaderStartupModule extends ResourceLoaderModule { |
| | 586 | + private $modifiedTime = null; |
| | 587 | + |
| 586 | 588 | public function getScript( $lang, $skin, $debug ) { |
| 587 | 589 | return ResourceLoader::getModuleRegistrations( $lang, $skin, $debug ); |
| 588 | 590 | } |
| 589 | 591 | |
| 590 | 592 | public function getModifiedTime( $lang, $skin, $debug ) { |
| 591 | | - return ResourceLoader::getHighestModifiedTime( $lang, $skin, $debug ); |
| | 593 | + if ( !is_null( $this->modifiedTime ) ) { |
| | 594 | + return $this->modifiedTime; |
| | 595 | + } |
| | 596 | + |
| | 597 | + // HACK getHighestModifiedTime() calls this function, so protect against infinite recursion |
| | 598 | + $this->modifiedTime = 1; |
| | 599 | + $this->modifiedTime = ResourceLoader::getHighestModifiedTime( $lang, $skin, $debug ); |
| | 600 | + return $this->modifiedTime; |
| 592 | 601 | } |
| 593 | 602 | |
| 594 | 603 | public function getClientMaxage() { |