jenkins-bot has submitted this change and it was merged.
Change subject: registration: Fix merge_strategy in manifest_version 2
......................................................................
registration: Fix merge_strategy in manifest_version 2
merge_strategy is set in $data, which is the definition of the config
setting, not the default value of it ($value).
Change-Id: I12ee95892b2c157bb0beb97cf2cd5ef920b7d52e
---
M includes/registration/ExtensionProcessor.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index 12218ce..0bf2842 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -392,7 +392,7 @@
foreach ( $info['config'] as $key => $data ) {
$value = $data['value'];
if ( isset( $value['merge_strategy'] ) ) {
-
$value[ExtensionRegistry::MERGE_STRATEGY] = $value['merge_strategy'];
+
$value[ExtensionRegistry::MERGE_STRATEGY] = $data['merge_strategy'];
}
$this->globals["$prefix$key"] = $value;
}
--
To view, visit https://gerrit.wikimedia.org/r/300669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12ee95892b2c157bb0beb97cf2cd5ef920b7d52e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <legoktm.wikipe...@gmail.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
