Merge pull request bcit-ci#1820 from appleboy/pagination

Fixed bcit-ci#1817 Pagination class error
JFox-sk · Sep 21, 2012 · 3596558 · 3596558
2 parents 8f72bdc + 6b4e362
commit 3596558
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
@@ -215,7 +215,8 @@ public function create_links()
 		// 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
 		{