Merge branch 'patch-1' of https://github.com/dixy/CodeIgniter-1 into dixy-patch-1

Conflicts:
	user_guide_src/source/changelog.rst

1 files changed, 2 insertions, 2 deletions

diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index e0cab2128..c59151bad 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -228,13 +228,13 @@ class CI_Pagination {
 		{
 			$i = ($this->use_page_numbers) ? $uri_page_number - 1 : $uri_page_number - $this->per_page;
 
-			if (($i == 0 OR ($this->use_page_numbers && $i == 1)) AND $this->first_url != '')
+			if ($i == $base_page AND $this->first_url != '')
 			{
 				$output .= $this->prev_tag_open.'<a '.$this->anchor_class.'href="'.$this->first_url.'">'.$this->prev_link.'</a>'.$this->prev_tag_close;
 			}
 			else
 			{
-				$i = ($i == 0) ? '' : $this->prefix.$i.$this->suffix;
+				$i = ($i == $base_page) ? '' : $this->prefix.$i.$this->suffix;
 				$output .= $this->prev_tag_open.'<a '.$this->anchor_class.'href="'.$this->base_url.$i.'">'.$this->prev_link.'</a>'.$this->prev_tag_close;
 			}