diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2009-02-26 13:22:51 -0800 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2009-02-26 13:22:51 -0800 |
commit | 34a61b40f47a52d1fdcf7cd907f3ac53b96b038e (patch) | |
tree | 14ddeb18d9e020760d8c2308a12d858b6eab4a17 /actions/login.php | |
parent | 478192fa3b2375a0ff0a5ff03956381e5da7a6ac (diff) | |
parent | 8c3fe83c645265a11a3fca80cac2ac48ea72cdab (diff) |
Merge branch '0.7.x' into 0.8.x
Diffstat (limited to 'actions/login.php')
-rw-r--r-- | actions/login.php | 6 |
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; } |