summaryrefslogtreecommitdiff
path: root/extlib/Net/URL
diff options
context:
space:
mode:
authorCiaranG <ciaran@ciarang.com>2009-03-21 14:24:19 +0000
committerCiaranG <ciaran@ciarang.com>2009-03-21 14:24:19 +0000
commitd64be5108d69ff4068d4383ab121a3ba7388ada3 (patch)
tree20e651bc4c42fb5699b88eace08f962c66ae9d5c /extlib/Net/URL
parentc4072ef7c930b82b74f8e90f6554974b761c686c (diff)
Fix to Net_URL_Mapper to make search pagination work. See Ticket #1333
Diffstat (limited to 'extlib/Net/URL')
-rw-r--r--extlib/Net/URL/Mapper/Path.php9
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
+?>