Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/316525

Change subject: Fixed JsonConfigs global var initialization
......................................................................

Fixed JsonConfigs global var initialization

Bug: T147971
Change-Id: Ib349302c7d7539e693cd1974f23dad584ade8d23
Depends-on: Ica6ddd0ae76f23e60de9b6235c6e2a3f2754a95d
Depends-on: Ibd88c4dc98f36d7d8336691884bbaa9a4864da83
Depends-on: I830bfa81ee882029b9017e141d73182556ebb1cf
Depends-on: I5182a109cbfe99d1428f141b31b24ccf9e2517d0
---
M extension.json
1 file changed, 16 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroPortal 
refs/changes/25/316525/1

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: newchange
Gerrit-Change-Id: Ib349302c7d7539e693cd1974f23dad584ade8d23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroPortal
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to