Reedy has submitted this change and it was merged.
Change subject: Fixed JsonConfigs global var initialization
......................................................................
Fixed JsonConfigs global var initialization
Bug: T147971
Depends-on: I830bfa81ee882029b9017e141d73182556ebb1cf
Change-Id: I5182a109cbfe99d1428f141b31b24ccf9e2517d0
---
M extension.json
1 file changed, 19 insertions(+), 13 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index a50f8ac..64248b7 100644
--- a/extension.json
+++ b/extension.json
@@ -134,20 +134,26 @@
"SpecialMobileEditWatchlist::images":
"ZeroBanner\\PageRenderingHooks::onSpecialMobileEditWatchlist_images",
"ResourceLoaderTestModules":
"ZeroBanner\\TestHooks::onResourceLoaderTestModules"
},
- "JsonConfigModels": {
- "JsonZeroConfig": {
- "class": "ZeroBanner\\ZeroConfig"
- }
- },
- "JsonConfigs": {
- "JsonZeroConfig": {
- "namespace": 480,
- "nsName": "Zero",
- "isLocal": false,
- "cacheKey": "1"
- }
- },
"config": {
+ "JsonConfigModels": {
+ "merge_strategy": "array_replace_recursive",
+ "value": {
+ "JsonZeroConfig": {
+ "class": "ZeroBanner\\ZeroConfig"
+ }
+ }
+ },
+ "JsonConfigs": {
+ "merge_strategy": "array_replace_recursive",
+ "value": {
+ "JsonZeroConfig": {
+ "namespace": 480,
+ "nsName": "Zero",
+ "isLocal": false,
+ "cacheKey": "1"
+ }
+ }
+ },
"ZeroSiteOverride": {
"@note": "false|string[] For testing, overrides
Conf->siteFromDB( DBname )",
"@note2": "On a test wiki, set it to ['wikipedia','en']
or similar.",
--
To view, visit https://gerrit.wikimedia.org/r/316524
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5182a109cbfe99d1428f141b31b24ccf9e2517d0
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ZeroBanner
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
