summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_user.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-09-26 18:05:35 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-09-26 18:05:35 +0000
commit2327e2a30f6563710382f198a7e7370abce9a050 (patch)
tree8f879301798eb3bafc61a3330650c4c0cc1183a0 /roundcubemail/program/include/rcube_user.php
parent3703130cfb1862cdd5df1cec27e7669c8c088807 (diff)
- call user2email also for login with @ (#1486147)
git-svn-id: https://svn.roundcube.net/trunk@2992 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_user.php')
-rw-r--r--roundcubemail/program/include/rcube_user.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php
index 54a76c5ab..c2cad1121 100644
--- a/roundcubemail/program/include/rcube_user.php
+++ b/roundcubemail/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',