Browse Source

Avoid inline assignment

Mark Scherer 10 years ago
parent
commit
313bd378a7
1 changed files with 3 additions and 1 deletions
  1. 3 1
      src/Controller/Controller.php

+ 3 - 1
src/Controller/Controller.php

@@ -13,12 +13,14 @@ class Controller extends ShimController {
 	 * Handles automatic pagination of model records.
 	 * Handles automatic pagination of model records.
 	 *
 	 *
 	 * @overwrite to support defaults like limit etc.
 	 * @overwrite to support defaults like limit etc.
+	 *
 	 * @param \Cake\ORM\Table|string|\Cake\ORM\Query $object Table to paginate
 	 * @param \Cake\ORM\Table|string|\Cake\ORM\Query $object Table to paginate
 	 *   (e.g: Table instance, 'TableName' or a Query object)
 	 *   (e.g: Table instance, 'TableName' or a Query object)
 	 * @return \Cake\ORM\ResultSet Query results
 	 * @return \Cake\ORM\ResultSet Query results
 	 */
 	 */
 	public function paginate($object = null) {
 	public function paginate($object = null) {
-		if ($defaultSettings = (array)Configure::read('Paginator')) {
+		$defaultSettings = (array)Configure::read('Paginator');
+		if ($defaultSettings) {
 			$this->paginate += $defaultSettings;
 			$this->paginate += $defaultSettings;
 		}
 		}
 		return parent::paginate($object);
 		return parent::paginate($object);