diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-25 11:57:21 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-25 11:57:21 -0800 |
| commit | b7037a49af97db73b3adc77d3f78ffb0805c7c68 (patch) | |
| tree | 65d1e25c383308401ece976a79350b05c2f11c6c /lib/util.php | |
| parent | fb8b8615b0140b97f3f7dd5ebdc8f70304f792f7 (diff) | |
| parent | a8d0c8d8efca2f0ecd4203184c44c73ff11309fb (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
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 9c50d9931..d1c78f7d0 100644 --- a/lib/util.php +++ b/lib/util.php @@ -134,7 +134,7 @@ function common_check_user($nickname, $password) $authenticatedUser = false; if (Event::handle('StartCheckPassword', array($nickname, $password, &$authenticatedUser))) { - $user = User::staticGet('nickname', $nickname); + $user = User::staticGet('nickname', common_canonical_nickname($nickname)); if (!empty($user)) { if (!empty($password)) { // never allow login with blank password if (0 == strcmp(common_munge_password($password, $user->id), |