summaryrefslogtreecommitdiffstats
path: root/system/libraries
diff options
context:
space:
mode:
authorEric Barnes <eric@ericlbarnes.com>2012-01-05 03:25:56 +0100
committerEric Barnes <eric@ericlbarnes.com>2012-01-05 03:25:56 +0100
commitc3eb5e1879a9cf3fa497b5f3365c246a85c94898 (patch)
treec632591c646927c4c60ace51da68abd9134a33a2 /system/libraries
parent3b376595183e0e0db5559ccbfc368c442408dca9 (diff)
parent37b1d9ba5bef4594aaf458e0406599bdf33deb46 (diff)
Merge branch 'patch-1' of https://github.com/dixy/CodeIgniter-1 into dixy-patch-1
Conflicts: user_guide_src/source/changelog.rst
Diffstat (limited to 'system/libraries')
-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 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;
}