From: Ori Livneh <ori@wikimedia.org>
Date: Wed, 8 Jun 2016 19:57:50 +0000 (-0700)
Subject: resourceloader: Load ResourceModuleSkinStyles config once per register() call
X-Git-Tag: 1.31.0-rc.0~6684^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=d6102d26a011337d4786282e8fb89f644aa2f3b7;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Load ResourceModuleSkinStyles config once per register() call

Change-Id: I052503027f656fe15fca1069017a05ab589efaac
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 086ab17cdb..09535b731e 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -313,6 +313,7 @@ class ResourceLoader implements LoggerAwareInterface {
 	 *   not registered
 	 */
 	public function register( $name, $info = null ) {
+		$moduleSkinStyles = $this->config->get( 'ResourceModuleSkinStyles' );
 
 		// Allow multiple modules to be registered in one call
 		$registrations = is_array( $name ) ? $name : [ $name => $info ];
@@ -351,7 +352,7 @@ class ResourceLoader implements LoggerAwareInterface {
 
 			// Apply custom skin-defined styles to existing modules.
 			if ( $this->isFileModule( $name ) ) {
-				foreach ( $this->config->get( 'ResourceModuleSkinStyles' ) as $skinName => $skinStyles ) {
+				foreach ( $moduleSkinStyles as $skinName => $skinStyles ) {
 					// If this module already defines skinStyles for this skin, ignore $wgResourceModuleSkinStyles.
 					if ( isset( $this->moduleInfos[$name]['skinStyles'][$skinName] ) ) {
 						continue;