Merge branch 'xorg/maint'

diff --git a/htdocs/images/ax_mail_header.jpg b/htdocs/images/ax_mail_header.jpg
index 74fffab..4ed47bb 100644 (file)
Binary files a/htdocs/images/ax_mail_header.jpg and b/htdocs/images/ax_mail_header.jpg differ

diff --git a/include/validations/names.inc.php b/include/validations/names.inc.php
index 26fd292..2060dd0 100644 (file)
--- a/include/validations/names.inc.php
+++ b/include/validations/names.inc.php
@@ -59,6 +59,13 @@ class NamesReq extends ProfileValidate
                                              FROM  email_source_account
                                             WHERE  email = {?} AND type != \'alias_aux\'',
                                           $this->new_alias);
+                if (!$used) {
+                    // Check against homonyms
+                    $used = XDB::fetchOneCell('SELECT  COUNT(email)
+                                                 FROM  email_source_other
+                                                WHERE  email = {?}',
+                                              $this->new_alias);
+                }
                 if ($used) {
                     $this->new_alias = null;
                 }