(bug 26507) Wrap all ResourceLoader-served JS in (function($, mw) { code here })...

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index ce62b38..a3c1cd1 100644 (file)
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -533,7 +533,7 @@ class ResourceLoader {
                        'mediaWiki.loader.implement', 
                        array(
                                $name,
-                               new XmlJsCode( "function() {{$scripts}}" ),
+                               new XmlJsCode( "function( $, mw ) {{$scripts}}" ),
                                (object)$styles,
                                (object)$messages
                        ) );

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 8eab4ba..7533c1e 100644 (file)
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -661,7 +661,7 @@ window.mediaWiki = new ( function( $ ) {
                        }
                        // Execute script
                        try {
-                               registry[module].script();
+                               registry[module].script( jQuery, mediaWiki );
                                registry[module].state = 'ready';
                                // Run jobs who's dependencies have just been met
                                for ( var j = 0; j < jobs.length; j++ ) {