Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 9e4ecba12a2f9d8dd00e287fb8df751a317ace22 1 parent 527ff5f
@ceeram ceeram authored markstory committed
Showing with 1 addition and 1 deletion.
  1. +1 −1  cake/libs/controller/components/auth.php
View
2  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 {
Please sign in to comment.
Something went wrong with that request. Please try again.