From d92926f892d72b631ba7ec3447eb73caf9ff03bd Mon Sep 17 00:00:00 2001 From: CiaranG Date: Sat, 21 Mar 2009 14:24:19 +0000 Subject: [PATCH] Fix to Net_URL_Mapper to make search pagination work. See Ticket #1333 --- extlib/Net/URL/Mapper/Path.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/extlib/Net/URL/Mapper/Path.php b/extlib/Net/URL/Mapper/Path.php index b541002c7a..eb1c34a3fa 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 +?> -- 2.39.5