forked from GNUsocial/gnu-social
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"
This commit is contained in:
@@ -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),
|
||||
|
Reference in New Issue
Block a user