Changeset 6064

Timestamp:

09/08/2007 02:27:24 PM (17 years ago)

Author:

markjaquith

Message:

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

Location:

trunk/wp-includes

Files:

• compat.php (modified) (2 diffs)
• functions.php (modified) (3 diffs)

trunk/wp-includes/compat.php

@@ -106 +106 @@
 
 // from php.net (modified by Mark Jaquith to behave like the native PHP5 function)
-function _http_build_query($data, $prefix=null, $sep=null, $key='') {
+function _http_build_query($data, $prefix=null, $sep=null, $key='', $urlencode=true) {
     $ret = array();
+    if ( $urlencode ) {
+        $lsb = '%5B';
+        $rsb = '%5D';
+    } else {
+        $lsb = '[';
+        $rsb = ']';
+    }
     foreach ( (array) $data as $k => $v ) {
-        $k = urlencode($k);
+        if ( $urlencode)
+            $k = urlencode($k);
         if ( is_int($k) && $prefix != null )
             $k = $prefix.$k;
         if ( !empty($key) )
             $k = $key . '%5B' . $k . '%5D';
-
         if ( $v === NULL )
             continue;
@@ -121 +128 @@
 
         if ( is_array($v) || is_object($v) )
-            array_push($ret,_http_build_query($v, '', $sep, $k));
+            array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
+        elseif ( $urlencode )
+            array_push($ret, $k.'='.urlencode($v));
         else
-            array_push($ret, $k.'='.urlencode($v));
-        }
+            array_push($ret, $k.'='.$v);
+    }
 
     if ( NULL === $sep )

trunk/wp-includes/functions.php

@@ -582 +582 @@
 }
 
+function build_query($data) {
+    return _http_build_query($data, NULL, '&', '', false);
+}
+
 /*
 add_query_arg: Returns a modified querystring by adding
@@ -636 +640 @@
 
     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);
@@ -648 +653 @@
     }
 
-    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);