summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-07-01 00:50:19 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-07-01 00:50:19 +0000
commit6c28a07cf58120e271de6e0c9c89a1f9a6d0101e (patch)
tree26683f5909d96ab00a5cb6d8e58f374fa99db0ee /lib/util.php
parent015492daace57361c3cdfe91feafdbeb2d2cf6bd (diff)
parentfbb7757c4b546bee7b2bf224e5544f7af3fa7d94 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php
index f9ff38c8a..272104581 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),