summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-22 15:39:12 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-22 15:39:12 +0200
commite66d6243aaf13053631641973a0beff656a94510 (patch)
tree31285ee902e262d9d798ce63f5a299157be7a4e9 /system
parent8df1ae2d7e0fd441f7a1fc481c76c5c1edfadf23 (diff)
Fix issues #1476, #1909
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Pagination.php4
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