Applied patch for bug #25044 by Niklas Laxström -- THANKS!

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9272c7b..fab31a8 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -142,6 +142,12 @@ $wgScript           = false;
 $wgRedirectScript   = false; ///< defaults to
 /**@}*/
 
+/**
+ * The URL path to load.php.
+ *
+ * Defaults to "{$wgScriptPath}/load{$wgScriptExtension}".
+ */
+$wgLoadScript           = false;
 
 /************************************************************************//**
  * @name   URLs and file paths

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 0d80888..93f245f 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2281,7 +2281,7 @@ class OutputPage {
        }
        
        static function makeResourceLoaderLink( $skin, $modules, $only ) {
-               global $wgUser, $wgLang, $wgRequest;
+               global $wgUser, $wgLang, $wgRequest, $wgLoadScript;
                // TODO: Should this be a static function of ResourceLoader instead?
                $query = array(
                        'modules' => implode( '|', array_unique( (array) $modules ) ),
@@ -2292,9 +2292,9 @@ class OutputPage {
                );
                // Automatically select style/script elements
                if ( $only === 'styles' ) {
-                       return Html::linkedStyle( wfAppendQuery( wfScript( 'load' ), $query ) );
+                       return Html::linkedStyle( wfAppendQuery( $wgLoadScript, $query ) );
                } else {
-                       return Html::linkedScript( wfAppendQuery( wfScript( 'load' ), $query ) );
+                       return Html::linkedScript( wfAppendQuery( $wgLoadScript, $query ) );
                }
        }
        

diff --git a/includes/Setup.php b/includes/Setup.php
index 6bf163e..002c128 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -29,6 +29,7 @@ if ( !isset( $wgVersion ) ) {
 // Set various default paths sensibly...
 if( $wgScript === false ) $wgScript = "$wgScriptPath/index$wgScriptExtension";
 if( $wgRedirectScript === false ) $wgRedirectScript = "$wgScriptPath/redirect$wgScriptExtension";
+if( $wgLoadScript === false ) $wgLoadScript = "$wgScriptPath/load$wgScriptExtension";
 
 if( $wgArticlePath === false ) {
        if( $wgUsePathInfo ) {