commit 6b4e3624b9a33c144b3ab4aea7904d5919fcc306
author Bo-Yi Wu <appleboy.tw@gmail.com> Fri Sep 21 13:57:24 2012 +0800
committer Bo-Yi Wu <appleboy.tw@gmail.com> Fri Sep 21 13:57:24 2012 +0800
tree 12838a4344d19f745e560132bcb3dbe8eab8915b
parent 4cfde87eb65a28d03e3f02be634a96aedd79dae2

Fixed #1817 Pagination class error

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

system/libraries/Pagination.php

diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 4fa605c..e1e729b 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -215,7 +215,8 @@
 		// 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).'&'.$this->query_string_segment.'=';
+			$segment = (strpos($this->base_url, '?')) ? '&' : '?';
+			$this->base_url = rtrim($this->base_url).$segment.$this->query_string_segment.'=';
 		}
 		else
 		{