Ticket #4878: 4878.001.diff

wp-includes/functions.php

@@ -644 +644 @@
                 $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]);
         }
+
+        $ret = http_build_query($qs);
         $ret = trim($ret, '?');
+        $ret = preg_replace('#=(&|$)#', '$1', $ret);
         $ret = $protocol . $base . $ret . $frag;
         $ret = rtrim($ret, '?');
         return $ret;