summaryrefslogtreecommitdiff
path: root/extlib
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-03-30 15:15:40 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-03-30 15:15:40 +0000
commit27b45eeb4882e6c8d5de65d913a148437e91b50c (patch)
treeb90fa9d4c2d8c75e33126f6a67f0f968255c1d8e /extlib
parent8c073a34ce472fc8d0385659a222339a5ba4254a (diff)
parent559cf75edbbf60a0d9f8e4991333d85a79359a99 (diff)
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'extlib')
-rw-r--r--extlib/Net/URL/Mapper/Path.php9
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