Permalink
Browse files

Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into hmvc_…

…unit
  • Loading branch information...
2 parents 42b8206 + 3596558 commit cd68ce2ea202064b97effe3a2849de6e68f91f71 @dchill42 committed Sep 21, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −1 system/libraries/Pagination.php
  2. +1 −1 user_guide_src/source/libraries/pagination.rst
@@ -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
{
@@ -80,7 +80,7 @@ The number of "digit" links you would like before and after the selected
page number. For example, the number 2 will place two digits on either
side, as in the example links at the very top of this page.
-$config['use_page_number'] = TRUE;
+$config['use_page_numbers'] = TRUE;
==================================
By default, the URI segment will use the starting index for the items

0 comments on commit cd68ce2

Please sign in to comment.