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

Timestamp:

10/31/2006 05:49:14 AM (20 years ago)

Author:

markjaquith

Message:

Better preservation of query string when using add_query_arg(). Props in self- and Andy-flavored varieties. fixes #3308

File:

• trunk/wp-includes/functions.php (modified) (2 diffs)

trunk/wp-includes/functions.php

@@ -668 +668 @@
 
         foreach($qs as $k => $v) {
-                if ( $v != '' ) {
+                if ( $v !== FALSE ) {
                         if ( $ret != '' )
                                 $ret .= '&';
-                        $ret .= "$k=$v";
+                        if ( empty($v) && !preg_match('|[?&]' . preg_quote($k, '|') . '=|', $query) )
+                                $ret .= $k;
+                        else
+                                $ret .= "$k=$v";
                 }
         }
@@ -693 +696 @@
         if ( is_array($key) ) { // removing multiple keys
                 foreach ( (array) $key as $k )
-                        $query = add_query_arg($k, '', $query);
+                        $query = add_query_arg($k, FALSE, $query);
                 return $query;
         }
-        return add_query_arg($key, '', $query);
+        return add_query_arg($key, FALSE, $query);
 }