Permalink
Browse files

Fix issues #1476, #1909

  • Loading branch information...
narfbg committed Oct 22, 2012
1 parent 8df1ae2 commit e66d6243aaf13053631641973a0beff656a94510
Showing with 3 additions and 2 deletions.
  1. +2 −2 system/libraries/Pagination.php
  2. +1 −0 user_guide_src/source/changelog.rst
@@ -157,7 +157,7 @@ public function create_links()
// 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));

This comment has been minimized.

Show comment
Hide comment
@keatliang2005

keatliang2005 Nov 6, 2012

This changes seems like broke the pagination where the current page is not highlighted and it's always pointing to first page.

@keatliang2005

keatliang2005 Nov 6, 2012

This changes seems like broke the pagination where the current page is not highlighted and it's always pointing to first page.

}
if ($CI->config->item('enable_query_strings') === TRUE OR $this->page_query_string === TRUE)
@@ -169,7 +169,7 @@ public function create_links()
}
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
@@ -369,6 +369,7 @@ Bug fixes for 3.0
- Fixed a bug (#1897) - :doc:`Email Library <libraries/email>` triggered PHP E_WARNING errors when *mail* protocol used and ``to()`` is never called.
- Fixed a bug (#1409) - :doc:`Email Library <libraries/email>` didn't properly handle multibyte characters when applying Q-encoding to headers.
- Fixed a bug where :doc:`Email Library <libraries/email>` didn't honor it's *wordwrap* setting while handling alternative messages.
- Fixed a bug (#1476, #1909) - :doc:`Pagination Library <libraries/pagination>` didn't take into account actual routing when determining the current page.
Version 2.1.3
=============

0 comments on commit e66d624

Please sign in to comment.