http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72144
Revision: 72144
Author: tparscal
Date: 2010-09-01 18:40:20 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
Using correct timestamp format for loading jquery|mediawiki through startup
Modified Paths:
--------------
branches/resourceloader/phase3/includes/ResourceLoader.php
Modified: branches/resourceloader/phase3/includes/ResourceLoader.php
===================================================================
--- branches/resourceloader/phase3/includes/ResourceLoader.php 2010-09-01
18:39:50 UTC (rev 72143)
+++ branches/resourceloader/phase3/includes/ResourceLoader.php 2010-09-01
18:40:20 UTC (rev 72144)
@@ -334,7 +334,20 @@
FormatJson::encode( array(
'server' => $server, 'debug' => $parameters['debug'] ) ) . " );\n";
// Wrap in a closure
$scripts = "window.mediaWikiStartUp =
function() {" . $scripts . "};";
- $query = wfArrayToCGI( $parameters );
+ $query = wfArrayToCGI( $parameters +
array( 'version' => wfTimestamp(
+ TS_ISO_8601,
+ round(
+ max(
+
self::$modules['jquery']->getModifiedTime(
+
$parameters['lang'], $parameters['skin'], $parameters['debug']
+ ),
+
self::$modules['mediawiki']->getModifiedTime(
+
$parameters['lang'], $parameters['skin'], $parameters['debug']
+ )
+ ),
+ -2
+ )
+ ) ) );
$scripts .= "document.write('<script
type=\"text/javascript\" " .
"src=\"{$server}?modules=jquery|mediawiki&{$query}\"></script>');";
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
