Merge pull request #1067 from ceeram/paginatecount

Avoid calling paginateCount when there are no results.
cakephp · Jan 12, 2013 · e7330fa · e7330fa
2 parents d571b05 + d3f9cc1
commit e7330fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/Cake/Controller/Component/PaginatorComponent.php b/lib/Cake/Controller/Component/PaginatorComponent.php
@@ -197,7 +197,9 @@ public function paginate($object = null, $scope = array(), $whitelist = array())
 		$defaults = $this->getDefaults($object->alias);
 		unset($defaults[0]);
 
-		if ($object->hasMethod('paginateCount')) {
+		if (!$results) {
+			$count = 0;
+		} elseif ($object->hasMethod('paginateCount')) {
 			$count = $object->paginateCount($conditions, $recursive, $extra);
 		} else {
 			$parameters = compact('conditions');

diff --git a/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php b/lib/Cake/Test/Case/Controller/Component/PaginatorComponentTest.php
@@ -140,10 +140,11 @@ class ControllerPaginateModel extends CakeTestModel {
 /**
  * paginate method
  *
- * @return void
+ * @return boolean
  */
 	public function paginate($conditions, $fields, $order, $limit, $page, $recursive, $extra) {
 		$this->extra = $extra;
+		return true;
 	}
 
 /**