fixed error when passing false for $conditions, closes #1685

cakephp · May 8, 2011 · 9e4ecba · 9e4ecba
1 parent 527ff5f
commit 9e4ecba
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
@@ -841,7 +841,7 @@ function &getModel($name = null) {
  */
 	function identify($user = null, $conditions = null) {
 		if ($conditions === false) {
-			$conditions = null;
+			$conditions = array();
 		} elseif (is_array($conditions)) {
 			$conditions = array_merge((array)$this->userScope, $conditions);
 		} else {