r72763 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72762‎ | r72763 | r72764 >
Date:21:51, 10 September 2010
Author:tparscal
Status:ok (Comments)
Tags:
Comment:
Applied patch for bug #25044 by Niklas Laxström -- THANKS!
Modified paths:
  • /trunk/phase3/includes/DefaultSettings.php (modified) (history)
  • /trunk/phase3/includes/OutputPage.php (modified) (history)
  • /trunk/phase3/includes/Setup.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/Setup.php
@@ -29,6 +29,7 @@
3030 // Set various default paths sensibly...
3131 if( $wgScript === false ) $wgScript = "$wgScriptPath/index$wgScriptExtension";
3232 if( $wgRedirectScript === false ) $wgRedirectScript = "$wgScriptPath/redirect$wgScriptExtension";
 33+if( $wgLoadScript === false ) $wgLoadScript = "$wgScriptPath/load$wgScriptExtension";
3334
3435 if( $wgArticlePath === false ) {
3536 if( $wgUsePathInfo ) {
Index: trunk/phase3/includes/OutputPage.php
@@ -2281,7 +2281,7 @@
22822282 }
22832283
22842284 static function makeResourceLoaderLink( $skin, $modules, $only ) {
2285 - global $wgUser, $wgLang, $wgRequest;
 2285+ global $wgUser, $wgLang, $wgRequest, $wgLoadScript;
22862286 // TODO: Should this be a static function of ResourceLoader instead?
22872287 $query = array(
22882288 'modules' => implode( '|', array_unique( (array) $modules ) ),
@@ -2292,9 +2292,9 @@
22932293 );
22942294 // Automatically select style/script elements
22952295 if ( $only === 'styles' ) {
2296 - return Html::linkedStyle( wfAppendQuery( wfScript( 'load' ), $query ) );
 2296+ return Html::linkedStyle( wfAppendQuery( $wgLoadScript, $query ) );
22972297 } else {
2298 - return Html::linkedScript( wfAppendQuery( wfScript( 'load' ), $query ) );
 2298+ return Html::linkedScript( wfAppendQuery( $wgLoadScript, $query ) );
22992299 }
23002300 }
23012301
Index: trunk/phase3/includes/DefaultSettings.php
@@ -142,6 +142,12 @@
143143 $wgRedirectScript = false; ///< defaults to
144144 /**@}*/
145145
 146+/**
 147+ * The URL path to load.php.
 148+ *
 149+ * Defaults to "{$wgScriptPath}/load{$wgScriptExtension}".
 150+ */
 151+$wgLoadScript = false;
146152
147153 /************************************************************************//**
148154 * @name URLs and file paths

Follow-up revisions

RevisionCommit summaryAuthorDate
r72772Major refactoring of site and user CSS, creating ResourceLoaderUserModule and...tparscal03:26, 11 September 2010

Comments

#Comment by Bryan (talk | contribs)   14:39, 11 September 2010

While it is indeed good practice to thank patch submitters, please in the future also include a short description of what the patch actually does in the commit description.

#Comment by Trevor Parscal (WMF) (talk | contribs)   01:56, 12 September 2010

No disagreement here - sorry about that.

Status & tagging log