Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into...

[quix0rs-gnu-social.git] / lib / util.php

diff --git a/lib/util.php b/lib/util.php
index 203506bbc06635424564962cab2829f4f0397254..461ca15c15dbb0cf20c4c67ecbc5021520e90462 100644 (file)
--- 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),