Changeset 5999 for trunk/wp-includes/functions.php

Timestamp:

09/01/2007 03:41:50 AM (18 years ago)

Author:

markjaquith

Message:

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

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -645 +645 @@
     }
 
-    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, '?');