From 7e45ed193ae8fab494f613b4246da424b5cc7115 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Sun, 2 Sep 2007 05:49:54 +0000 Subject: [PATCH] Eliminate double urlencode()ing in add_query_arg(). Move &-to-& conversion to wp_nonce_url(). fixes #4884 git-svn-id: http://svn.automattic.com/wordpress/trunk@6008 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index d83ea814e3..8d6860cefd 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -606,8 +606,6 @@ function add_query_arg() { $uri = @func_get_arg(2); } - $uri = str_replace('&', '&', $uri); - if ( $frag = strstr($uri, '#') ) $uri = substr($uri, 0, -strlen($frag)); else @@ -638,7 +636,6 @@ function add_query_arg() { } wp_parse_str($query, $qs); - $qs = urlencode_deep($qs); if ( is_array(func_get_arg(0)) ) { $kayvees = func_get_arg(0); $qs = array_merge($qs, $kayvees); @@ -853,6 +850,7 @@ function is_blog_installed() { } function wp_nonce_url($actionurl, $action = -1) { + $actionurl = str_replace('&', '&', $actionurl); return wp_specialchars(add_query_arg('_wpnonce', wp_create_nonce($action), $actionurl)); }