diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-03-23 15:55:07 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-23 15:55:07 -0400 |
| commit | 8c073a34ce472fc8d0385659a222339a5ba4254a (patch) | |
| tree | 57c83c48333b52a93b84d0910f9450c210e1815c /extlib | |
| parent | b3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (diff) | |
| parent | 14afe2d26874ed30a0ccef5e0acda2c5171afcde (diff) | |
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'extlib')
| -rw-r--r-- | extlib/Net/URL/Mapper/Path.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/extlib/Net/URL/Mapper/Path.php b/extlib/Net/URL/Mapper/Path.php index b541002c7..eb1c34a3f 100644 --- a/extlib/Net/URL/Mapper/Path.php +++ b/extlib/Net/URL/Mapper/Path.php @@ -241,7 +241,12 @@ class Net_URL_Mapper_Path } $path = '/'.trim(Net_URL::resolvePath($path), '/'); if (!empty($qstring)) { - $path .= '?'.http_build_query($qstring); + if (!strpos($path, '?')) { + $path .= '?'; + } else { + $path .= '&'; + } + $path .= http_build_query($qstring); } if (!empty($anchor)) { $path .= '#'.ltrim($anchor, '#'); @@ -427,4 +432,4 @@ class Net_URL_Mapper_Path } -?>
\ No newline at end of file +?> |