diff options
author | Takayuki Sakai <kaky0922@gmail.com> | 2014-06-13 11:38:05 +0200 |
---|---|---|
committer | Takayuki Sakai <kaky0922@gmail.com> | 2014-06-13 11:38:05 +0200 |
commit | 8bc5903ce7d4694f50c2cd02036a788c88c134f2 (patch) | |
tree | 8f57b0c7059e4a329a57b1d81a28e6a33bf42d06 /system | |
parent | 1240b6a04ee4e6a200cc882481f09fce6a7eb4fc (diff) |
Make 'num_links=0' configuration available in Pagination library
Changed conditions when making 'first' and 'last' links
Diffstat (limited to 'system')
-rw-r--r-- | system/libraries/Pagination.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php index 5b9bfcb5d..3c8baac36 100644 --- a/system/libraries/Pagination.php +++ b/system/libraries/Pagination.php @@ -393,9 +393,9 @@ class CI_Pagination { // Check the user defined number of links. $this->num_links = (int) $this->num_links; - if ($this->num_links < 1) + if ($this->num_links < 0) { - show_error('Your number of links must be a positive number.'); + show_error('Your number of links must be a non-negative number.'); } // Keep any existing query string items. @@ -533,7 +533,7 @@ class CI_Pagination { $output = ''; // Render the "First" link. - if ($this->first_link !== FALSE && $this->cur_page > ($this->num_links + 1)) + if ($this->first_link !== FALSE && $this->cur_page > ($this->num_links + 1 + ! $this->num_links)) { // Take the general parameters, and squeeze this pagination-page attr in for JS frameworks. $attributes = sprintf('%s %s="%d"', $this->_attributes, $this->data_page_attr, 1); @@ -609,7 +609,7 @@ class CI_Pagination { } // Render the "Last" link - if ($this->last_link !== FALSE && ($this->cur_page + $this->num_links) < $num_pages) + if ($this->last_link !== FALSE && ($this->cur_page + $this->num_links + ! $this->num_links) < $num_pages) { $i = ($this->use_page_numbers) ? $num_pages : ($num_pages * $this->per_page) - $this->per_page; |