dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
6a1bc33
)
Merge "Fix phpdoc of wfArrayToCgi"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Mon, 7 Dec 2015 20:39:59 +0000
(20:39 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Mon, 7 Dec 2015 20:40:00 +0000
(20:40 +0000)
includes/GlobalFunctions.php
patch
|
blob
|
history
diff --git
a/includes/GlobalFunctions.php
b/includes/GlobalFunctions.php
index
4a3fceb
..
4c85bd6
100644
(file)
--- a/
includes/GlobalFunctions.php
+++ b/
includes/GlobalFunctions.php
@@
-460,12
+460,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
*/