From d68ea7ce6db0e457bc87045624e168252b772314 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Fri, 22 Jul 2016 14:59:07 -0700 Subject: [PATCH] registration: Fix merge_strategy in manifest_version 2 merge_strategy is set in $data, which is the definition of the config setting, not the default value of it ($value). Change-Id: I12ee95892b2c157bb0beb97cf2cd5ef920b7d52e --- includes/registration/ExtensionProcessor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php index 12218cea60..0bf2842f3f 100644 --- a/includes/registration/ExtensionProcessor.php +++ b/includes/registration/ExtensionProcessor.php @@ -392,7 +392,7 @@ class ExtensionProcessor implements Processor { foreach ( $info['config'] as $key => $data ) { $value = $data['value']; if ( isset( $value['merge_strategy'] ) ) { - $value[ExtensionRegistry::MERGE_STRATEGY] = $value['merge_strategy']; + $value[ExtensionRegistry::MERGE_STRATEGY] = $data['merge_strategy']; } $this->globals["$prefix$key"] = $value; } -- 2.20.1