r81732 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r81731‎ | r81732 | r81733 >
Date:12:35, 8 February 2011
Author:catrope
Status:ok
Tags:
Comment:
1.17wmf1: MFT r81731
Modified paths:
  • /branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFileModule.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderFileModule.php
@@ -206,8 +206,6 @@
207207 * @return String: JavaScript code for $context
208208 */
209209 public function getScript( ResourceLoaderContext $context ) {
210 - global $wgServer;
211 -
212210 $files = array_merge(
213211 $this->scripts,
214212 self::tryForKey( $this->languageScripts, $context->getLanguage() ),
@@ -218,7 +216,7 @@
219217 if ( $this->debugRaw ) {
220218 $script = '';
221219 foreach ( $files as $file ) {
222 - $path = $wgServer . $this->getRemotePath( $file );
 220+ $path = $this->getRemotePath( $file );
223221 $script .= "\n\t" . Xml::encodeJsCall( 'mediaWiki.loader.load', array( $path ) );
224222 }
225223 return $script;

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r81731Remove $wgServer prepending from remote JS/CSS paths. It's not needed and bre...catrope12:34, 8 February 2011

Status & tagging log