From: Yuri Astrakhan <yurik@wikimedia.org>
Date: Tue, 18 Oct 2016 04:46:11 +0000 (-0400)
Subject: registration: Fix ignoring 'merge_strategy' key in manifest_version 2
X-Git-Tag: 1.31.0-rc.0~5086^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=25fd321ac256bbb9a4811722e67574344862c5c0;p=lhc%2Fweb%2Fwiklou.git

registration: Fix ignoring 'merge_strategy' key in manifest_version 2

Bug: T148493
Change-Id: Ibd88c4dc98f36d7d8336691884bbaa9a4864da83
---

diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index 745c233b51..d613b2eeb7 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -397,7 +397,7 @@ class ExtensionProcessor implements Processor {
 		if ( isset( $info['config'] ) ) {
 			foreach ( $info['config'] as $key => $data ) {
 				$value = $data['value'];
-				if ( isset( $value['merge_strategy'] ) ) {
+				if ( isset( $data['merge_strategy'] ) ) {
 					$value[ExtensionRegistry::MERGE_STRATEGY] = $data['merge_strategy'];
 				}
 				if ( isset( $data['path'] ) && $data['path'] ) {