http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72731
Revision: 72731
Author: tparscal
Date: 2010-09-10 18:42:26 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
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: trunk/phase3/includes/ResourceLoaderModule.php
===================================================================
--- trunk/phase3/includes/ResourceLoaderModule.php 2010-09-10 18:24:45 UTC
(rev 72730)
+++ trunk/phase3/includes/ResourceLoaderModule.php 2010-09-10 18:42:26 UTC
(rev 72731)
@@ -372,11 +372,11 @@
}
$styles[$media] .= $style;
}
- foreach ( $this->getPrimaryStyles() as $media => $style ) {
+ foreach ( $this->getSkinStyles( $context->getSkin() ) as $media
=> $style ) {
if ( !isset( $styles[$media] ) ) {
$styles[$media] = '';
}
- $styles[$media] .= $this->getSkinStyles(
$context->getSkin() );
+ $styles[$media] .= $style;
}
// Collect referenced files
@@ -718,7 +718,9 @@
return $this->modifiedTime;
}
- public function getStyles( ResourceLoaderContext $context ) { return
array(); }
+ public function getStyles( ResourceLoaderContext $context ) {
+ return array();
+ }
public function getMessages() { return array(); }
public function getLoaderScript() { return ''; }
public function getDependencies() { return array(); }
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
