From 8b1b82f396a0ed25e28ed474378e9c1d6c6dbe6b Mon Sep 17 00:00:00 2001
From: Catrope <roan.kattouw@gmail.com>
Date: Tue, 21 Aug 2012 12:38:00 -0700
Subject: [PATCH] Make wfScript()/mw.util.wikiScript() respect
 $wgScript/$wgLoadScript

mw.util.wikiScript() and mw.util.wikiScript( 'index' ) now return the
value of $wgScript rather than building the path to index.php manually;
the latter is incorrect if $wgScript is customized. Similarly,
mw.util.wikiScript( 'load' ) now uses $wgLoadScript.

Same for wfScript(), wfScript( 'index' ) and wfScript( 'load' )

The qunit tests already had a test case for wgScript, but wgScript was
set in a way that didn't trigger the bug. Changed it to use customized
wgScript and wgLoadScript values and added test cases for 'index' and
'load'

This fixes bug 39103 (wfScript/mw.util.wikiScript do not respect custom
$wgScript/$wgLoadScript) as well as bug 39102 ("Entry points" on
Special:Version do not respect custom $wgScript/$wgLoadScript)

Change-Id: I5c9e82849e314dc7a87f8ae91150cc412b4011cf
---
 includes/GlobalFunctions.php                          | 11 +++++++++--
 resources/mediawiki/mediawiki.util.js                 | 11 +++++++++--
 .../suites/resources/mediawiki/mediawiki.util.test.js |  9 ++++++---
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 708fae6fb3..4252f55aa9 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -3590,13 +3590,20 @@ function wfQueriesMustScale() {
 /**
  * Get the path to a specified script file, respecting file
  * extensions; this is a wrapper around $wgScriptExtension etc.
+ * except for 'index' and 'load' which use $wgScript/$wgLoadScript
  *
  * @param $script String: script filename, sans extension
  * @return String
  */
 function wfScript( $script = 'index' ) {
-	global $wgScriptPath, $wgScriptExtension;
-	return "{$wgScriptPath}/{$script}{$wgScriptExtension}";
+	global $wgScriptPath, $wgScriptExtension, $wgScript, $wgLoadScript;
+	if ( $script === 'index' ) {
+		return $wgScript;
+	} else if ( $script === 'load' ) {
+		return $wgLoadScript;
+	} else {
+		return "{$wgScriptPath}/{$script}{$wgScriptExtension}";
+	}
 }
 
 /**
diff --git a/resources/mediawiki/mediawiki.util.js b/resources/mediawiki/mediawiki.util.js
index d1bfd056b1..7e2bab8239 100644
--- a/resources/mediawiki/mediawiki.util.js
+++ b/resources/mediawiki/mediawiki.util.js
@@ -157,8 +157,15 @@
 		 * @return string Address to script (eg. '/w/api.php' )
 		 */
 		wikiScript: function ( str ) {
-			return mw.config.get( 'wgScriptPath' ) + '/' + ( str || 'index' ) +
-				mw.config.get( 'wgScriptExtension' );
+			str = str || 'index';
+			if ( str === 'index' ) {
+				return mw.config.get( 'wgScript' );
+			} else if ( str === 'load' ) {
+				return mw.config.get( 'wgLoadScript' );
+			} else {
+				return mw.config.get( 'wgScriptPath' ) + '/' + str +
+					mw.config.get( 'wgScriptExtension' );
+			}
 		},
 
 		/**
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index d9b2055988..ababa8d9ed 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -24,14 +24,17 @@ QUnit.test( 'wikiGetlink', 3, function ( assert ) {
 	assert.equal( hrefC, '/wiki/Foobar', 'Default title; Get link for current page ("Foobar")' );
 });
 
-QUnit.test( 'wikiScript', 2, function ( assert ) {
+QUnit.test( 'wikiScript', 4, function ( assert ) {
 	mw.config.set({
-		'wgScript': '/w/index.php',
+		'wgScript': '/w/i.php', // customized wgScript for bug 39103
+		'wgLoadScript': '/w/l.php', // customized wgLoadScript for bug 39103
 		'wgScriptPath': '/w',
 		'wgScriptExtension': '.php'
 	});
 
-	assert.equal( mw.util.wikiScript(), mw.config.get( 'wgScript' ), 'Defaults to index.php and is equal to wgScript' );
+	assert.equal( mw.util.wikiScript(), mw.config.get( 'wgScript' ), 'wikiScript() returns wgScript' );
+	assert.equal( mw.util.wikiScript( 'index' ), mw.config.get( 'wgScript' ), "wikiScript( 'index' ) returns wgScript" );
+	assert.equal( mw.util.wikiScript( 'load' ), mw.config.get( 'wgLoadScript' ), "wikiScript( 'load' ) returns wgLoadScript" );
 	assert.equal( mw.util.wikiScript( 'api' ), '/w/api.php', 'API path' );
 });
 
-- 
2.20.1