| Index: trunk/phase3/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -63,7 +63,7 @@ |
| 64 | 64 | // Get file dependency information |
| 65 | 65 | $res = $dbr->select( 'module_deps', array( 'md_module', 'md_deps' ), array( |
| 66 | 66 | 'md_module' => $modules, |
| 67 | | - 'md_skin' => $context->getSkin() |
| | 67 | + 'md_skin' => $skin |
| 68 | 68 | ), __METHOD__ |
| 69 | 69 | ); |
| 70 | 70 | |
| Index: trunk/phase3/resources/mediawiki/mediawiki.js |
| — | — | @@ -956,7 +956,7 @@ |
| 957 | 957 | // include modules which are already loaded |
| 958 | 958 | batch = []; |
| 959 | 959 | // Asynchronously append a script tag to the end of the body |
| 960 | | - function request() { |
| | 960 | + function getScriptTag() { |
| 961 | 961 | var html = ''; |
| 962 | 962 | for ( var r = 0; r < requests.length; r++ ) { |
| 963 | 963 | requests[r] = sortQuery( requests[r] ); |
| — | — | @@ -969,9 +969,9 @@ |
| 970 | 970 | } |
| 971 | 971 | // Load asynchronously after documument ready |
| 972 | 972 | if ( ready ) { |
| 973 | | - setTimeout( function() { $( 'body' ).append( request() ); }, 0 ); |
| | 973 | + setTimeout( function() { $( 'body' ).append( getScriptTag() ); }, 0 ); |
| 974 | 974 | } else { |
| 975 | | - document.write( request() ); |
| | 975 | + document.write( getScriptTag() ); |
| 976 | 976 | } |
| 977 | 977 | } |
| 978 | 978 | }; |