avoid paginate count when no results

cakephp · Jan 10, 2013 · 88240b2 · 88240b2
1 parent 7008b81
commit 88240b2
Showing 1 changed file with 3 additions and 1 deletion.
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');