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

trac at roundcube.net trac at roundcube.net
Thu Aug 5 09:14:08 CEST 2010


Author: alec
Date: 2010-08-05 02:14:08 -0500 (Thu, 05 Aug 2010)
New Revision: 3870

Modified:
   trunk/roundcubemail/program/include/rcube_user.php
Log:
- Fix: rcube_user::get_username() doesn't take mail_domain setting into account (#1486895)


Modified: trunk/roundcubemail/program/include/rcube_user.php
===================================================================
--- trunk/roundcubemail/program/include/rcube_user.php	2010-08-05 05:13:15 UTC (rev 3869)
+++ trunk/roundcubemail/program/include/rcube_user.php	2010-08-05 07:14:08 UTC (rev 3870)
@@ -74,9 +74,11 @@
             if ($part == 'local') {
                 return $local;
             }
-            // if no domain was provided use the default if available
-            if (empty($domain))
-                $domain = $this->data['mail_host'];
+            // if no domain was provided...
+            if (empty($domain)) {
+                $rcmail = rcmail::get_instance();
+                $domain = $rcmail->config->mail_domain($this->data['mail_host']);
+            }
 
             if ($part == 'domain') {
                 return $domain;

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



More information about the Svn mailing list