summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAlex Bilbie <alex@alexbilbie.com>2012-09-21 12:42:58 +0200
committerAlex Bilbie <alex@alexbilbie.com>2012-09-21 12:42:58 +0200
commit3596558b4e9e95ebb1652388c8268d02c46a1b7b (patch)
treebf85d10b87062d4be215c287803578c14167e102 /system
parent8f72bdcc104965359fd87b35064a2e60e15a756b (diff)
parent6b4e3624b9a33c144b3ab4aea7904d5919fcc306 (diff)
Merge pull request #1820 from appleboy/pagination
Fixed #1817 Pagination class error
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Pagination.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 4fa605ca9..e1e729bb0 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -215,7 +215,8 @@ class CI_Pagination {
// string. If post, add a trailing slash to the base URL if needed
if ($CI->config->item('enable_query_strings') === TRUE OR $this->page_query_string === TRUE)
{
- $this->base_url = rtrim($this->base_url).'&amp;'.$this->query_string_segment.'=';
+ $segment = (strpos($this->base_url, '?')) ? '&amp;' : '?';
+ $this->base_url = rtrim($this->base_url).$segment.$this->query_string_segment.'=';
}
else
{