r72391 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72390‎ | r72391 | r72392 >
Date:19:54, 4 September 2010
Author:maxsem
Status:ok (Comments)
Tags:
Comment:
load.php5 support for r72349
Modified paths:
  • /trunk/phase3/includes/OutputPage.php (modified) (history)
  • /trunk/phase3/includes/ResourceLoader.php (modified) (history)
  • /trunk/phase3/load.php5 (added) (history)

Diff [purge]

Index: trunk/phase3/includes/OutputPage.php
@@ -2285,9 +2285,9 @@
22862286 );
22872287 // Automatically select style/script elements
22882288 if ( $only === 'styles' ) {
2289 - return Html::linkedStyle( wfAppendQuery( $wgScriptPath . '/load.php', $query ) );
 2289+ return Html::linkedStyle( wfAppendQuery( wfScript( 'load' ), $query ) );
22902290 } else {
2291 - return Html::linkedScript( wfAppendQuery( $wgScriptPath . '/load.php', $query ) );
 2291+ return Html::linkedScript( wfAppendQuery( wfScript( 'load' ), $query ) );
22922292 }
22932293 }
22942294
Index: trunk/phase3/includes/ResourceLoader.php
@@ -58,7 +58,7 @@
5959 * ) );
6060 * @example
6161 * // Responds to a resource loading request
62 - * ResourceLoader::respond( $wgRequest, $wgServer . $wgScriptPath . '/load.php' );
 62+ * ResourceLoader::respond( $wgRequest, $wgServer . wfScript( 'load' ) );
6363 */
6464 class ResourceLoader {
6565 /* Protected Static Members */
Index: trunk/phase3/load.php5
@@ -0,0 +1 @@
 2+<?php require './load.php';
\ No newline at end of file
Property changes on: trunk/phase3/load.php5
___________________________________________________________________
Added: svn:eol-style
13 + native

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r72349Merging resourceloader branch into trunk. Full documentation is at http://www...catrope04:00, 4 September 2010

Comments

#Comment by Nikerabbit (talk | contribs)   21:13, 4 September 2010

Bug 25044 is related.

Status & tagging log