From: addshore <addshorewiki@gmail.com>
Date: Sat, 5 Dec 2015 19:07:03 +0000 (+0100)
Subject: Fix phpdoc of wfArrayToCgi
X-Git-Tag: 1.31.0-rc.0~8771^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=d50ca328033702ced91947e60939e3550ca0212a;p=lhc%2Fweb%2Fwiklou.git

Fix phpdoc of wfArrayToCgi

Change-Id: I87db5c251310f6f56f0ec47cbb7f034ed43c31ac
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 43b936b54b..d17a55de7b 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -458,12 +458,12 @@ function wfUrlencode( $s ) {
 }
 
 /**
- * This function takes two arrays as input, and returns a CGI-style string, e.g.
+ * This function takes one or two arrays as input, and returns a CGI-style string, e.g.
  * "days=7&limit=100". Options in the first array override options in the second.
  * Options set to null or false will not be output.
  *
  * @param array $array1 ( String|Array )
- * @param array $array2 ( String|Array )
+ * @param array|null $array2 ( String|Array )
  * @param string $prefix
  * @return string
  */