diff options
| author | CiaranG <ciaran@ciarang.com> | 2009-03-25 15:39:58 +0000 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-03-25 12:27:14 -0400 |
| commit | 55e8a6ca1b0af8e05a7ee22735585ef5ebd66fc6 (patch) | |
| tree | b72e288fa29201d731322a0d381cb977e6b87ea8 /extlib | |
| parent | d92926f892d72b631ba7ec3447eb73caf9ff03bd (diff) | |
A different search pagination fix (see ticket #1333) that doesn't require fixing the upstream code, thus undoing the change made in d64be5108d69ff4068d4383ab121a3ba7388ada3
Merged.
Diffstat (limited to 'extlib')
| -rw-r--r-- | extlib/Net/URL/Mapper/Path.php | 9 |
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 |