diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-23 04:59:09 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-23 04:59:09 +0200 |
| commit | c2f59ef2d5d3ef28a113a11c24bee25eb03eeb56 (patch) | |
| tree | f704c46f5a71c7267cbf15e706a744a36e3da208 /system/libraries/Pagination.php | |
| parent | cf99aac39914d821e8864443d3aaa759f87258e9 (diff) | |
| parent | f5f898f8f30968fb36413a14de2dc6a4599b79a6 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/libraries/Pagination.php')
| -rw-r--r-- | system/libraries/Pagination.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index e1e729bb0..36b57b332 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -157,7 +157,7 @@ class CI_Pagination { // See if we are using a prefix or suffix on links if ($this->prefix !== '' OR $this->suffix !== '') { - $this->cur_page = (int) str_replace(array($this->prefix, $this->suffix), '', $CI->uri->segment($this->uri_segment)); + $this->cur_page = (int) str_replace(array($this->prefix, $this->suffix), '', $CI->uri->rsegment($this->uri_segment)); } if ($CI->config->item('enable_query_strings') === TRUE OR $this->page_query_string === TRUE) @@ -169,7 +169,7 @@ class CI_Pagination { } elseif ( ! $this->cur_page && $CI->uri->segment($this->uri_segment) !== $base_page) { - $this->cur_page = (int) $CI->uri->segment($this->uri_segment); + $this->cur_page = (int) $CI->uri->rsegment($this->uri_segment); } // Set current page to 1 if it's not valid or if using page numbers instead of offset |