From 60c317caba8ce95ef49ad7ccf3b088b8ad3c5584 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sun, 14 Aug 2011 22:39:50 -0500 Subject: [PATCH] refactoring pagination class. --- system/paginator.php | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/system/paginator.php b/system/paginator.php index 97fa0755..bc55643f 100644 --- a/system/paginator.php +++ b/system/paginator.php @@ -116,22 +116,11 @@ public function links($adjacent = 3) { if ($this->last_page <= 1) return ''; - return ''; - } - - /** - * Generate the HTML numeric page links. - * - * If there are not enough pages to make it worth sliding, all of the pages will be listed. - * - * @param int $adjacent - * @return string - */ - private function numbers($adjacent = 3) - { // The hard-coded "7" is to account for all of the constant elements in a sliding range. // Namely: The the current page, the two ellipses, the two beginning pages, and the two ending pages. - return ($this->last_page < 7 + ($adjacent * 2)) ? $this->range(1, $this->last_page) : $this->slider($adjacent); + $numbers = ($this->last_page < 7 + ($adjacent * 2)) ? $this->range(1, $this->last_page) : $this->slider($adjacent); + + return ''; } /** @@ -246,7 +235,7 @@ private function link($page, $text, $class) $append .= '&'.$key.'='.$value; } - return HTML::link(Request::uri().'?page='.$page.$append, $text, array('class' => $class), Request::is_secure()); + return HTML::link(Request::uri().'?page='.$page.$append, $text, compact('class'), Request::is_secure()); } /**