[Svn] r2992 - trunk/roundcubemail/program/include

trac at roundcube.net trac at roundcube.net
Sat Sep 26 20:05:35 CEST 2009


Author: alec
Date: 2009-09-26 13:05:35 -0500 (Sat, 26 Sep 2009)
New Revision: 2992

Modified:
   trunk/roundcubemail/program/include/rcube_user.php
Log:
- call user2email also for login with @ (#1486147)


Modified: trunk/roundcubemail/program/include/rcube_user.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_user.php	2009-09-25 12:23:46 UTC (rev 2991)
+++ trunk/roundcubemail/program/include/rcube_user.php	2009-09-26 18:05:35 UTC (rev 2992)
@@ -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',

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn



More information about the Svn mailing list