dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f8ba06a
)
registration: Fix upgradeExtensionJsonSchema to remove _merge_strategy
author
Kunal Mehta
<legoktm@member.fsf.org>
Tue, 12 May 2020 19:13:26 +0000
(12:13 -0700)
committer
Reedy
<reedy@wikimedia.org>
Tue, 12 May 2020 19:29:02 +0000
(19:29 +0000)
The unset() call was on the wrong array.
Bug: T252576
Change-Id: Ieaa3273d2867df87f67b110e97149410066b6795
maintenance/updateExtensionJsonSchema.php
patch
|
blob
|
history
diff --git
a/maintenance/updateExtensionJsonSchema.php
b/maintenance/updateExtensionJsonSchema.php
index
6233d5b
..
46c8b77
100644
(file)
--- 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] );
}
}
}