Changeset 4435

Show
Ignore:
Timestamp:
10/31/06 05:49:14 (2 years ago)
Author:
markjaquith
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/functions.php

    r4419 r4435  
    668668 
    669669    foreach($qs as $k => $v) { 
    670         if ( $v != '' ) { 
     670        if ( $v !== FALSE ) { 
    671671            if ( $ret != '' ) 
    672672                $ret .= '&'; 
    673             $ret .= "$k=$v"; 
     673            if ( empty($v) && !preg_match('|[?&]' . preg_quote($k, '|') . '=|', $query) ) 
     674                $ret .= $k; 
     675            else 
     676                $ret .= "$k=$v"; 
    674677        } 
    675678    } 
    …… 
    693696    if ( is_array($key) ) { // removing multiple keys 
    694697        foreach ( (array) $key as $k ) 
    695             $query = add_query_arg($k, '', $query); 
     698            $query = add_query_arg($k, FALSE, $query); 
    696699        return $query; 
    697700    } 
    698     return add_query_arg($key, '', $query); 
     701    return add_query_arg($key, FALSE, $query); 
    699702} 
    700703