From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Mon, 1 Oct 2012 19:11:21 +0000 (+0200)
Subject: Fix documentation of $wgProxyList
X-Git-Tag: 1.31.0-rc.0~22189^2
X-Git-Url: http://git.cyclocoop.org//%22%22._DIR_PLUGIN_FULLCALENDAR.%22prive/themes/spip/images/event_edit.png/%22?a=commitdiff_plain;h=3a02e56bbe62a1648f8e96adf5595ef6f7d8c495;p=lhc%2Fweb%2Fwiklou.git

Fix documentation of $wgProxyList

Change-Id: Iaac13bee34a978061605182123a90b3167e78129
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c2574dd09e..ae8a2ad00b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4276,8 +4276,18 @@ $wgProxyScriptPath = "$IP/maintenance/proxy_check.php";
 $wgProxyMemcExpiry = 86400;
 /** This should always be customised in LocalSettings.php */
 $wgSecretKey = false;
-/** big list of banned IP addresses, in the keys not the values */
+
+/**
+ * Big list of banned IP addresses.
+ *
+ * This can have the following formats:
+ * - An array of addresses, either in the values
+ *   or the keys (for backward compatibility)
+ * - A string, in that case this is the path to a file
+ *   containing the list of IP addresses, one per line
+ */
 $wgProxyList = array();
+
 /** deprecated */
 $wgProxyKey = false;