diff options
| author | Sarven Capadisli <csarven@controlyourself.ca> | 2009-03-25 18:29:09 +0000 |
|---|---|---|
| committer | Sarven Capadisli <csarven@controlyourself.ca> | 2009-03-25 18:29:09 +0000 |
| commit | ce325a06b129e639a3e51c8396f0d54b40f2e239 (patch) | |
| tree | ea72f00798c5e872b1ea0fe411fb6467a0947388 /extlib | |
| parent | a13bfa5848705d23353783f195b67c088a72a8cb (diff) | |
| parent | 2becd5849d76e052ecfe066b5376a65b9c70fad6 (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'extlib')
| -rw-r--r-- | extlib/Net/URL/Mapper/Path.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/extlib/Net/URL/Mapper/Path.php b/extlib/Net/URL/Mapper/Path.php index eb1c34a3f..b541002c7 100644 --- a/extlib/Net/URL/Mapper/Path.php +++ b/extlib/Net/URL/Mapper/Path.php @@ -241,12 +241,7 @@ class Net_URL_Mapper_Path } $path = '/'.trim(Net_URL::resolvePath($path), '/'); if (!empty($qstring)) { - if (!strpos($path, '?')) { - $path .= '?'; - } else { - $path .= '&'; - } - $path .= http_build_query($qstring); + $path .= '?'.http_build_query($qstring); } if (!empty($anchor)) { $path .= '#'.ltrim($anchor, '#'); @@ -432,4 +427,4 @@ class Net_URL_Mapper_Path } -?> +?>
\ No newline at end of file |