From 984e9727a09866612c62cd4cda76a9767bae2db7 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 26 Sep 2009 14:05:35 -0400
Subject: [PATCH] - call user2email also for login with @ (#1486147)
---
program/include/rcube_user.php | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 54a76c5..c2cad11 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -360,9 +360,8 @@
$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',
--
Gitblit v1.9.1