From 80f7dc77d430774192b929d780f96260066df2ee Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 18 Oct 2015 09:31:31 +0200
Subject: Update to MediaWiki 1.25.3

---
 docs/extension.schema.json | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index d5c17a17..610e9c0e 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -627,7 +627,31 @@
 		},
 		"config": {
 			"type": "object",
-			"description": "Configuration options for this extension"
+			"description": "Configuration options for this extension",
+			"properties": {
+				"_prefix": {
+					"type": "string",
+					"default": "wg",
+					"description": "Prefix to put in front of configuration settings when exporting them to $GLOBALS"
+				}
+			},
+			"patternProperties": {
+				"^[a-zA-Z_\u007f-\u00ff][a-zA-Z0-9_\u007f-\u00ff]*$": {
+					"type": ["object", "array", "string", "integer", "null", "boolean"],
+					"properties": {
+						"_merge_strategy": {
+							"type": "string",
+							"enum": [
+								"array_merge_recursive",
+								"array_plus_2d",
+								"array_plus",
+								"array_merge"
+							],
+							"default": "array_merge"
+						}
+					}
+				}
+			}
 		},
 		"ParserTestFiles": {
 			"type": "array",
-- 
cgit v1.2.2