From: Trevor Parscal <tparscal@users.mediawiki.org>
Date: Fri, 10 Sep 2010 18:42:26 +0000 (+0000)
Subject: Fixes issue in r72695 where ResourceLoaderFileModule::getStyles was iterating twice... 
X-Git-Tag: 1.31.0-rc.0~35052
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=931c7ff274799e3c52cb224ffbdb105ab9ac37a7;p=lhc%2Fweb%2Fwiklou.git

Fixes issue in r72695 where ResourceLoaderFileModule::getStyles was iterating twice over getPrimaryStyles rather than iterating over getPrimaryStyles and then getSkinsStyles.
---

diff --git a/includes/ResourceLoaderModule.php b/includes/ResourceLoaderModule.php
index 4f6277adea..cb1977a148 100644
--- a/includes/ResourceLoaderModule.php
+++ b/includes/ResourceLoaderModule.php
@@ -372,11 +372,11 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 			}
 			$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 @@ class ResourceLoaderSiteModule extends ResourceLoaderModule {
 		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(); }