mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-23 07:09:20 +01:00
"common::email_address() dont add @domain, if not domain (mail_suffix) specified"
This commit is contained in:
parent
eab06a2ac0
commit
3b5d46022d
@ -1316,7 +1316,7 @@
|
|||||||
$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
|
$email = str_replace(array('first','last','initial','account','dot','underscore','-'),
|
||||||
array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
|
array($first,$last,substr($first,0,1),$account,$dot,$underscore,''),
|
||||||
$GLOBALS['egw_info']['server']['email_address_format'] ? $GLOBALS['egw_info']['server']['email_address_format'] : 'first-dot-last').
|
$GLOBALS['egw_info']['server']['email_address_format'] ? $GLOBALS['egw_info']['server']['email_address_format'] : 'first-dot-last').
|
||||||
'@'.$domain;
|
($domain ? '@'.$domain : '');
|
||||||
//echo " = '$email'</p>\n";
|
//echo " = '$email'</p>\n";
|
||||||
return $email;
|
return $email;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user