| Index: branches/resourceloader/phase3/includes/ResourceLoaderModule.php |
| — | — | @@ -595,16 +595,17 @@ |
| 596 | 596 | private $modifiedTime = null; |
| 597 | 597 | |
| 598 | 598 | public function getScript( $lang, $skin, $debug ) { |
| 599 | | - return file_get_contents( 'resources/startup.js' ); |
| | 599 | + global $IP; |
| | 600 | + return file_get_contents( "$IP/resources/startup.js" ); |
| 600 | 601 | } |
| 601 | 602 | |
| 602 | 603 | public function getModifiedTime( $lang, $skin, $debug ) { |
| | 604 | + global $IP; |
| 603 | 605 | if ( !is_null( $this->modifiedTime ) ) { |
| 604 | 606 | return $this->modifiedTime; |
| 605 | 607 | } |
| 606 | | - |
| 607 | 608 | // HACK getHighestModifiedTime() calls this function, so protect against infinite recursion |
| 608 | | - $this->modifiedTime = 1; |
| | 609 | + $this->modifiedTime = filemtime( "$IP/resources/startup.js" ); |
| 609 | 610 | $this->modifiedTime = ResourceLoader::getHighestModifiedTime( $lang, $skin, $debug ); |
| 610 | 611 | return $this->modifiedTime; |
| 611 | 612 | } |