From: Krinkle <krinkle@users.mediawiki.org>
Date: Wed, 4 May 2011 20:58:14 +0000 (+0000)
Subject: mw.loader fixes
X-Git-Tag: 1.31.0-rc.0~30406
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=373859bafe0072365b8a488d174e9163f2f991bd;p=lhc%2Fweb%2Fwiklou.git

mw.loader fixes
* Renaming locally declared function "request" to "getScriptTag" to avoid confusion or conflict with the other local "request" function inside the mw.loader closure
* (bug 26804) Code clean up ($skin was generated locally already)
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index f8bd0d15cf..18a050478e 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -63,7 +63,7 @@ class ResourceLoader {
 		// Get file dependency information
 		$res = $dbr->select( 'module_deps', array( 'md_module', 'md_deps' ), array(
 				'md_module' => $modules,
-				'md_skin' => $context->getSkin()
+				'md_skin' => $skin
 			), __METHOD__
 		);
 
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 1d8ea23e4f..fe27fbadf2 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -956,7 +956,7 @@ window.mediaWiki = new ( function( $ ) {
 				// include modules which are already loaded
 				batch = [];
 				// Asynchronously append a script tag to the end of the body
-				function request() {
+				function getScriptTag() {
 					var html = '';
 					for ( var r = 0; r < requests.length; r++ ) {
 						requests[r] = sortQuery( requests[r] );
@@ -969,9 +969,9 @@ window.mediaWiki = new ( function( $ ) {
 				}
 				// Load asynchronously after documument ready
 				if ( ready ) {
-					setTimeout( function() { $( 'body' ).append( request() ); }, 0 );
+					setTimeout( function() { $( 'body' ).append( getScriptTag() ); }, 0 );
 				} else {
-					document.write( request() );
+					document.write( getScriptTag() );
 				}
 			}
 		};