http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97610
Revision: 97610
Author: catrope
Date: 2011-09-20 09:20:27 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
1.18wmf1: MFT r97607, r97608 (ResourceLoader fixes)
Modified Paths:
--------------
branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderContext.php
branches/wmf/1.18wmf1/resources/mediawiki/mediawiki.js
Modified:
branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderContext.php
===================================================================
--- branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderContext.php
2011-09-20 09:16:51 UTC (rev 97609)
+++ branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderContext.php
2011-09-20 09:20:27 UTC (rev 97610)
@@ -73,6 +73,8 @@
*/
public static function expandModuleNames( $modules ) {
$retval = array();
+ // For backwards compatibility with an earlier hack, replace !
with .
+ $modules = str_replace( '!', '.', $modules );
$exploded = explode( '|', $modules );
foreach ( $exploded as $group ) {
if ( strpos( $group, ',' ) === false ) {
Modified: branches/wmf/1.18wmf1/resources/mediawiki/mediawiki.js
===================================================================
--- branches/wmf/1.18wmf1/resources/mediawiki/mediawiki.js 2011-09-20
09:16:51 UTC (rev 97609)
+++ branches/wmf/1.18wmf1/resources/mediawiki/mediawiki.js 2011-09-20
09:20:27 UTC (rev 97610)
@@ -1064,6 +1064,11 @@
return null;
};
+ /**
+ * For backwards-compatibility with Squid-cached pages. Loads
mw.user
+ */
+ this.go = function() { mw.loader.load( 'mediawiki.user' ); };
+
/* Cache document ready status */
$(document).ready( function() { ready = true; } );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
