From 931c7ff274799e3c52cb224ffbdb105ab9ac37a7 Mon Sep 17 00:00:00 2001 From: Trevor Parscal Date: Fri, 10 Sep 2010 18:42:26 +0000 Subject: [PATCH] Fixes issue in r72695 where ResourceLoaderFileModule::getStyles was iterating twice over getPrimaryStyles rather than iterating over getPrimaryStyles and then getSkinsStyles. --- includes/ResourceLoaderModule.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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(); } -- 2.20.1