- call user2email also for login with @ (#1486147)

15 years ago · 984e9727a0
parent 614024c239
commit 984e9727a0
1 changed files with 2 additions and 3 deletions
--- 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',