summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-20 16:58:19 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-20 16:58:19 -0500
commit4aa9b95f51216edaffcd229d9c31a5f905a76b13 (patch)
tree7d0ce51e15fd51344a09524cf8ea19f204732a1c
parentd5bf7e5cfb4b4de335cafec69d93c565e0c9d2f4 (diff)
use return value of common_check_user() in login.php
-rw-r--r--actions/login.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/actions/login.php b/actions/login.php
index 71e467929..b049791fb 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -108,13 +108,15 @@ class LoginAction extends Action
$nickname = common_canonical_nickname($this->trimmed('nickname'));
$password = $this->arg('password');
- if (!common_check_user($nickname, $password)) {
+ $user = common_check_user($nickname, $password);
+
+ if (!$user) {
$this->showForm(_('Incorrect username or password.'));
return;
}
// success!
- if (!common_set_user($nickname)) {
+ if (!common_set_user($user)) {
$this->serverError(_('Error setting user.'));
return;
}