Permalink
Browse files

Merge pull request #1820 from appleboy/pagination

Fixed #1817 Pagination class error
  • Loading branch information...
2 parents 8f72bdc + 6b4e362 commit 3596558b4e9e95ebb1652388c8268d02c46a1b7b @alexbilbie alexbilbie committed Sep 21, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 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).'&'.$this->query_string_segment.'=';
+ $segment = (strpos($this->base_url, '?')) ? '&' : '?';
+ $this->base_url = rtrim($this->base_url).$segment.$this->query_string_segment.'=';
}
else
{

0 comments on commit 3596558

Please sign in to comment.