jenkins-bot has submitted this change and it was merged. Change subject: Preserve existing $wgBabelCategoryNames configurations ......................................................................
Preserve existing $wgBabelCategoryNames configurations A custom configuration will overwrite the default one, unless it's prepended with + in which case it will merge the two (unlikely to be desired). Per 1ebb0f5659667fd34, https://secure.php.net/manual/en/function.array-merge.php Follow-up to 8c8adf671422ec311bc005031f5c5046860bb613. Bug: T87883 Change-Id: If0cb5d9a303a28dc7d7f7bb7bcdf6263e63655e9 --- M extension.json 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, but someone else must approve Nikerabbit: Looks good to me, approved Thiemo Mättig (WMDE): Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/extension.json b/extension.json index a87ced6..aeb0896 100644 --- a/extension.json +++ b/extension.json @@ -47,7 +47,8 @@ "3": "%code%-3", "4": "%code%-4", "5": "%code%-5", - "N": "%code%-N" + "N": "%code%-N", + "_merge_strategy": "array_plus" }, "BabelMainCategory": "%code%", "BabelDefaultLevel": "N", -- To view, visit https://gerrit.wikimedia.org/r/237481 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0cb5d9a303a28dc7d7f7bb7bcdf6263e63655e9 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Babel Gerrit-Branch: master Gerrit-Owner: Nemo bis <federicol...@tiscali.it> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
