extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:12:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: Fix accounts selectbox in compose dialog does not include email addresses. Additionally, let local accounts without '@' get explicitly displayed in accounts selectbox.

Browse Source
This commit is contained in:
Hadi Nategh 2016-12-12 09:35:52 +01:00
parent 81421f8195
commit 760bd4106f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Mail/Account.php
View File

@ -1607,11 +1607,11 @@ class Account implements \ArrayAccess
{ {
$name = $account['acc_name']; $name = $account['acc_name'];
} }
if (!trim($account['ident_email'])) if (strpos($account['ident_email'], '@') !== false || !trim($account['ident_email']))
{ {
$name .= ' <'.$account['ident_email'].'>'; $name .= ' <'.$account['ident_email'].'>';
} }
elseif(!trim($account['acc_imap_username'])) elseif(strpos($account['acc_imap_username'], '@') !== false || !trim($account['acc_imap_username']))
{ {
$name .= ' <'.$account['acc_imap_username'].'>'; $name .= ' <'.$account['acc_imap_username'].'>';
} }