IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Preserve query string arrays in add_query_arg(). fixes #4878 for trunk

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@5999 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith
2007-09-01 03:41:50 +00:00
parent 93840b1632
commit 0906863d2c
2 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wp-includes/functions.php
View File

@@ -644,17 +644,17 @@ function add_query_arg() {
$qs[func_get_arg(0)] = func_get_arg(1);
}
foreach($qs as $k => $v) {
if ( $v !== FALSE ) {
if ( $ret != '' )
$ret .= '&';
if ( empty($v) && !preg_match('|[?&]' . preg_quote($k, '|') . '=|', $query) )
$ret .= $k;
else
$ret .= "$k=$v";
}
foreach ( $qs as $k => $v ) {
if ( $v === false )
unset($qs[$k]);
}
if ( ini_get('arg_separator.output') === '&')
$ret = http_build_query($qs, '', '&');
else
$ret = _http_build_query($qs, NULL, '&');
$ret = trim($ret, '?');
$ret = preg_replace('#=(&|$)#', '$1', $ret);
$ret = $protocol . $base . $ret . $frag;
$ret = rtrim($ret, '?');
return $ret;