diff options
| author | Zach Copley <zach@controlyourself.ca> | 2009-06-30 16:25:52 -0700 |
|---|---|---|
| committer | Zach Copley <zach@controlyourself.ca> | 2009-06-30 16:25:52 -0700 |
| commit | ccbc5c447df5a5284b8845d9a53f28d17d8df875 (patch) | |
| tree | ed45e1f842768e7993aff857a9edf5a36541f562 /lib/util.php | |
| parent | b10dba27982a94d73fb7f8d70cae611241871706 (diff) | |
| parent | 612a107e09619b92d4614e2f3076ddca5c65824c (diff) | |
Merge commit 'jeff-themovie/small-fixes' into 0.8.x
* commit 'jeff-themovie/small-fixes':
Fix missing max_id in API search calls
Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
Fix "Trying to get property of non-object" errors when accessing the people search results page
Fix "Undefined variable: cnt"
Fix "Trying to get property of non-object" errors in groupeditform.php
Fix "Undefined property: DisfavorAction::$id"
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 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), |