From d6102d26a011337d4786282e8fb89f644aa2f3b7 Mon Sep 17 00:00:00 2001 From: Ori Livneh Date: Wed, 8 Jun 2016 12:57:50 -0700 Subject: [PATCH] resourceloader: Load ResourceModuleSkinStyles config once per register() call Change-Id: I052503027f656fe15fca1069017a05ab589efaac --- includes/resourceloader/ResourceLoader.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- 2.20.1