diff options
| author | Federico Marani <federico.marani@ymail.com> | 2009-03-28 13:52:01 +0000 |
|---|---|---|
| committer | Federico Marani <federico.marani@ymail.com> | 2009-03-28 13:52:01 +0000 |
| commit | 4b3f022fc2ff142e6d1cb6740b7f89108cfda292 (patch) | |
| tree | a7e0f0e6730a02e6a2fc6196bbeabcb1b932baae /extlib | |
| parent | 420c3613049bec1360cdeb1f50283b239adf23d3 (diff) | |
| parent | 8c073a34ce472fc8d0385659a222339a5ba4254a (diff) | |
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:
lib/jabber.php
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 +?> |