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

Only urlencode previously existing values in add_query_arg() (more backwards compatible). fixes #4935. see #4084. see #4878

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@6064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith
2007-09-08 14:27:24 +00:00
parent 23b1e871a1
commit 79c4324e01
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/functions.php
View File

@@ -581,6 +581,10 @@ function is_new_day() {
}
}
function build_query($data) {
return _http_build_query($data, NULL, '&', '', false);
}
/*
add_query_arg: Returns a modified querystring by adding
a single key & value or an associative array.
@@ -635,6 +639,7 @@ function add_query_arg() {
}
wp_parse_str($query, $qs);
$qs = urlencode_deep($qs); // this re-URL-encodes things that were already in the query string
if ( is_array(func_get_arg(0)) ) {
$kayvees = func_get_arg(0);
$qs = array_merge($qs, $kayvees);
@@ -647,10 +652,7 @@ function add_query_arg() {
unset($qs[$k]);
}
if ( ini_get('arg_separator.output') === '&')
$ret = http_build_query($qs, '', '&');
else
$ret = _http_build_query($qs, NULL, '&');
$ret = build_query($qs);
$ret = trim($ret, '?');
$ret = preg_replace('#=(&|$)#', '$1', $ret);
$ret = $protocol . $base . $ret . $frag;