Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/316531
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 (cherry picked from commit 25fd321ac256bbb9a4811722e67574344862c5c0) --- M includes/registration/ExtensionProcessor.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/31/316531/1 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/316531 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd88c4dc98f36d7d8336691884bbaa9a4864da83 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.28.0-wmf.22 Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: Yurik <yu...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits