zendframework/zendframework#6808 zendframework/zendframework#6809 - a…

…void multiple internal calls to methods when values are already cached in `$pages`
zendframework · Dec 5, 2014 · d53f416 · d53f416
1 parent 1792754
commit d53f416
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/Paginator.php b/src/Paginator.php
@@ -916,10 +916,13 @@ protected function _createPages($scrollingStyle = null)
         // Item numbers
         if ($this->getCurrentItems() !== null) {
             $pages->currentItemCount = $this->getCurrentItemCount();
-            $pages->itemCountPerPage = $this->getItemCountPerPage();
             $pages->totalItemCount   = $this->getTotalItemCount();
-            $pages->firstItemNumber  = $this->getTotalItemCount() ? (($currentPageNumber - 1) * $this->getItemCountPerPage()) + 1 : 0;
-            $pages->lastItemNumber   = $this->getTotalItemCount() ? $pages->firstItemNumber + $pages->currentItemCount - 1 : 0;
+            $pages->firstItemNumber  = $pages->totalItemCount
+                ? (($currentPageNumber - 1) * $pages->itemCountPerPage) + 1
+                : 0;
+            $pages->lastItemNumber   = $pages->totalItemCount
+                ? $pages->firstItemNumber + $pages->currentItemCount - 1
+                : 0;
         }
 
         return $pages;