jenkins-bot has submitted this change and it was merged.
Change subject: registration: Fix ignoring 'merge_strategy' key in
manifest_version 2
......................................................................
registration: Fix ignoring 'merge_strategy' key in manifest_version 2
Bug: T148493
Change-Id: Ibd88c4dc98f36d7d8336691884bbaa9a4864da83
---
M includes/registration/ExtensionProcessor.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index 745c233..d613b2e 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -397,7 +397,7 @@
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'] ) {
--
To view, visit https://gerrit.wikimedia.org/r/316519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd88c4dc98f36d7d8336691884bbaa9a4864da83
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <a...@wikimedia.org>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
