http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72763
Revision: 72763
Author: tparscal
Date: 2010-09-10 21:51:25 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Applied patch for bug #25044 by Niklas Laxstr?\195?\182m -- THANKS!
Modified Paths:
--------------
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/OutputPage.php
trunk/phase3/includes/Setup.php
Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php 2010-09-10 21:41:34 UTC (rev
72762)
+++ trunk/phase3/includes/DefaultSettings.php 2010-09-10 21:51:25 UTC (rev
72763)
@@ -142,6 +142,12 @@
$wgRedirectScript = false; ///< defaults to
/*...@}*/
+/**
+ * The URL path to load.php.
+ *
+ * Defaults to "{$wgScriptPath}/load{$wgScriptExtension}".
+ */
+$wgLoadScript = false;
/************************************************************************//**
* @name URLs and file paths
Modified: trunk/phase3/includes/OutputPage.php
===================================================================
--- trunk/phase3/includes/OutputPage.php 2010-09-10 21:41:34 UTC (rev
72762)
+++ trunk/phase3/includes/OutputPage.php 2010-09-10 21:51:25 UTC (rev
72763)
@@ -2281,7 +2281,7 @@
}
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 @@
);
// 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 ) );
}
}
Modified: trunk/phase3/includes/Setup.php
===================================================================
--- trunk/phase3/includes/Setup.php 2010-09-10 21:41:34 UTC (rev 72762)
+++ trunk/phase3/includes/Setup.php 2010-09-10 21:51:25 UTC (rev 72763)
@@ -29,6 +29,7 @@
// 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 ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
