From bd3c9c3dafb7a08b5128533a9c553b002330a881 Mon Sep 17 00:00:00 2001 From: Sid Roberts Date: Tue, 5 May 2015 18:25:27 +0100 Subject: [PATCH] The Model Paginator now iterates over the models. --- phalcon/paginator/adapter/model.zep | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/phalcon/paginator/adapter/model.zep b/phalcon/paginator/adapter/model.zep index cdd9877dc94..7d7f212ff18 100644 --- a/phalcon/paginator/adapter/model.zep +++ b/phalcon/paginator/adapter/model.zep @@ -71,7 +71,7 @@ class Model extends Adapter implements AdapterInterface */ public function getPaginate() -> <\stdclass> { - var config, items, pageItems, page, valid; + var config, items, pageItems, page; int pageNumber, show, n, start, lastShowPage, i, next, totalPages, before; @@ -117,18 +117,13 @@ class Model extends Adapter implements AdapterInterface //The record must be iterable let i = 1; - loop { - - let valid = items->valid(); - if valid == false { - break; - } - + while items->valid() { let pageItems[] = items->current(); if i >= show { break; } let i++; + items->next(); } }