From f2d34f5877b59998d3f8dea73fd8559328ac461e Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Tue, 12 May 2020 12:13:26 -0700 Subject: [PATCH 1/1] registration: Fix upgradeExtensionJsonSchema to remove _merge_strategy The unset() call was on the wrong array. Bug: T252576 Change-Id: Ieaa3273d2867df87f67b110e97149410066b6795 --- maintenance/updateExtensionJsonSchema.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintenance/updateExtensionJsonSchema.php b/maintenance/updateExtensionJsonSchema.php index 6233d5b876..46c8b77add 100644 --- a/maintenance/updateExtensionJsonSchema.php +++ b/maintenance/updateExtensionJsonSchema.php @@ -57,7 +57,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] ); } } } -- 2.20.1