From: Kunal Mehta <legoktm@member.fsf.org>
Date: Fri, 22 Jul 2016 21:59:07 +0000 (-0700)
Subject: registration: Fix merge_strategy in manifest_version 2
X-Git-Tag: 1.31.0-rc.0~6286
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/Category:Foo?a=commitdiff_plain;h=d68ea7ce6db0e457bc87045624e168252b772314;p=lhc%2Fweb%2Fwiklou.git

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 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;
 			}