Skip to content
Permalink
Browse files

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

  • Loading branch information...
ceeram authored and markstory committed May 4, 2011
1 parent 527ff5f commit 9e4ecba12a2f9d8dd00e287fb8df751a317ace22
Showing with 1 addition and 1 deletion.
  1. +1 −1 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 {

0 comments on commit 9e4ecba

Please sign in to comment.
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.