summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2009-09-26 18:05:35 +0000
committeralecpl <alec@alec.pl>2009-09-26 18:05:35 +0000
commit984e9727a09866612c62cd4cda76a9767bae2db7 (patch)
tree8fc6bfaa03780c8a41e65dfc77c706be083e516b /program/include
parent614024c2393ae30b7d7aa8b139775ea2839cd3aa (diff)
- call user2email also for login with @ (#1486147)
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_user.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 54a76c5ab..c2cad1121 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -360,9 +360,8 @@ class rcube_user
$rcmail = rcmail::get_instance();
// try to resolve user in virtuser table and file
- if (!strpos($user, '@')) {
- if ($email_list = self::user2email($user, false, true))
- $user_email = is_array($email_list[0]) ? $email_list[0][0] : $email_list[0];
+ if ($email_list = self::user2email($user, false, true)) {
+ $user_email = is_array($email_list[0]) ? $email_list[0][0] : $email_list[0];
}
$data = $rcmail->plugins->exec_hook('create_user',