r72731 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72730‎ | r72731 | r72732 >
Date:18:42, 10 September 2010
Author:tparscal
Status:ok
Tags:
Comment:
Fixes issue in r72695 where ResourceLoaderFileModule::getStyles was iterating twice over getPrimaryStyles rather than iterating over getPrimaryStyles and then getSkinsStyles.
Modified paths:
  • /trunk/phase3/includes/ResourceLoaderModule.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/ResourceLoaderModule.php
@@ -372,11 +372,11 @@
373373 }
374374 $styles[$media] .= $style;
375375 }
376 - foreach ( $this->getPrimaryStyles() as $media => $style ) {
 376+ foreach ( $this->getSkinStyles( $context->getSkin() ) as $media => $style ) {
377377 if ( !isset( $styles[$media] ) ) {
378378 $styles[$media] = '';
379379 }
380 - $styles[$media] .= $this->getSkinStyles( $context->getSkin() );
 380+ $styles[$media] .= $style;
381381 }
382382
383383 // Collect referenced files
@@ -718,7 +718,9 @@
719719 return $this->modifiedTime;
720720 }
721721
722 - public function getStyles( ResourceLoaderContext $context ) { return array(); }
 722+ public function getStyles( ResourceLoaderContext $context ) {
 723+ return array();
 724+ }
723725 public function getMessages() { return array(); }
724726 public function getLoaderScript() { return ''; }
725727 public function getDependencies() { return array(); }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r72695Added media-type support for static and dynamic ResourceLoader requests.tparscal00:21, 10 September 2010

Status & tagging log