diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-07-01 12:58:49 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-07-01 12:58:49 -0400 |
commit | 721ba6c88f3c89c3efcc8e5f0c9169d94911825d (patch) | |
tree | f1b07dfc50858d98258a3043e3c6dbf4f00a22e3 /lib/util.php | |
parent | 8a8390c1a78a2586bb2e9e10bfcb3502739d8d76 (diff) | |
parent | 6c28a07cf58120e271de6e0c9c89a1f9a6d0101e (diff) |
Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x
Diffstat (limited to 'lib/util.php')
-rw-r--r-- | lib/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index 203506bbc..461ca15c1 100644 --- a/lib/util.php +++ b/lib/util.php @@ -114,7 +114,7 @@ function common_check_user($nickname, $password) return false; } $user = User::staticGet('nickname', $nickname); - if (is_null($user)) { + if (is_null($user) || $user === false) { return false; } else { if (0 == strcmp(common_munge_password($password, $user->id), |