From: Kunal Mehta <legoktm@member.fsf.org>
Date: Tue, 12 May 2020 19:13:26 +0000 (-0700)
Subject: registration: Fix upgradeExtensionJsonSchema to remove _merge_strategy
X-Git-Tag: 1.34.2~14
X-Git-Url: https://git.cyclocoop.org/%2C?a=commitdiff_plain;h=cebe19587c844265931873a6d8a4e1fb1c074cca;p=lhc%2Fweb%2Fwiklou.git

registration: Fix upgradeExtensionJsonSchema to remove _merge_strategy

The unset() call was on the wrong array.

Bug: T252576
Change-Id: Ieaa3273d2867df87f67b110e97149410066b6795
---

diff --git a/maintenance/updateExtensionJsonSchema.php b/maintenance/updateExtensionJsonSchema.php
index 18c71a3eaf..3618251f7d 100644
--- a/maintenance/updateExtensionJsonSchema.php
+++ b/maintenance/updateExtensionJsonSchema.php
@@ -58,7 +58,7 @@ class UpdateExtensionJsonSchema extends Maintenance {
 					$json['config'][$name] = [ 'value' => $value ];
 					if ( isset( $value[ExtensionRegistry::MERGE_STRATEGY] ) ) {
 						$json['config'][$name]['merge_strategy'] = $value[ExtensionRegistry::MERGE_STRATEGY];
-						unset( $value[ExtensionRegistry::MERGE_STRATEGY] );
+						unset( $json['config'][$name]['value'][ExtensionRegistry::MERGE_STRATEGY] );
 					}
 					if ( isset( $config["@$name"] ) ) {
 						// Put 'description' first for better human-legibility.