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

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index 12218ce..0bf2842 100644 (file)
--- 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;
                        }