http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72221
Revision: 72221
Author: tparscal
Date: 2010-09-02 20:10:55 +0000 (Thu, 02 Sep 2010)
Log Message:
-----------
Using $IP for accessing resources/statup.js and checking mtime as well.
Modified Paths:
--------------
branches/resourceloader/phase3/includes/ResourceLoaderModule.php
Modified: branches/resourceloader/phase3/includes/ResourceLoaderModule.php
===================================================================
--- branches/resourceloader/phase3/includes/ResourceLoaderModule.php
2010-09-02 19:58:33 UTC (rev 72220)
+++ branches/resourceloader/phase3/includes/ResourceLoaderModule.php
2010-09-02 20:10:55 UTC (rev 72221)
@@ -595,16 +595,17 @@
private $modifiedTime = null;
public function getScript( $lang, $skin, $debug ) {
- return file_get_contents( 'resources/startup.js' );
+ global $IP;
+ return file_get_contents( "$IP/resources/startup.js" );
}
public function getModifiedTime( $lang, $skin, $debug ) {
+ global $IP;
if ( !is_null( $this->modifiedTime ) ) {
return $this->modifiedTime;
}
-
// HACK getHighestModifiedTime() calls this function, so
protect against infinite recursion
- $this->modifiedTime = 1;
+ $this->modifiedTime = filemtime( "$IP/resources/startup.js" );
$this->modifiedTime = ResourceLoader::getHighestModifiedTime(
$lang, $skin, $debug );
return $this->modifiedTime;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
