jenkins-bot has submitted this change and it was merged. Change subject: Fixed JsonConfigs global var initialization ......................................................................
Fixed JsonConfigs global var initialization Bug: T147971 Depends-on: I5182a109cbfe99d1428f141b31b24ccf9e2517d0 Change-Id: Ib349302c7d7539e693cd1974f23dad584ade8d23 --- M extension.json 1 file changed, 16 insertions(+), 10 deletions(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 58e0812..e073a00 100644 --- a/extension.json +++ b/extension.json @@ -57,17 +57,23 @@ "BeforePageDisplay": "ZeroPortal\\ConfigPageHooks::onBeforePageDisplay", "ScribuntoExternalLibraries": "ZeroPortal\\LuaLibrary::onScribuntoExternalLibraries" }, - "JsonConfigModels": { - "JsonZeroConfig": { - "view": "ZeroPortal\\ZeroConfigView" - } - }, - "JsonConfigs": { - "JsonZeroConfig": { - "store": true - } - }, "config": { + "JsonConfigs": { + "merge_strategy": "array_replace_recursive", + "value": { + "JsonZeroConfig": { + "store": true + } + } + }, + "JsonConfigModels": { + "merge_strategy": "array_replace_recursive", + "value": { + "JsonZeroConfig": { + "view": "ZeroPortal\\ZeroConfigView" + } + } + }, "ZeroPortalImpersonateUser": { "value": false } -- To view, visit https://gerrit.wikimedia.org/r/316525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib349302c7d7539e693cd1974f23dad584ade8d23 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/ZeroPortal Gerrit-Branch: master Gerrit-Owner: Yurik <yu...@wikimedia.org> 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