Merge pull request #9181 from ATM-Nicolas/fix_dolGetFirstLastname

FIX : Wrong position of firstname lastname
This commit is contained in:
Laurent Destailleur 2018-08-12 18:11:36 +02:00 committed by GitHub
commit 56d8935976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -5855,7 +5855,7 @@ function dolGetFirstLastname($firstname,$lastname,$nameorder=-1)
$ret='';
// If order not defined, we use the setup
if ($nameorder < 0) $nameorder=$conf->global->MAIN_FIRSTNAME_NAME_POSITION;
if ($nameorder < 0) $nameorder=(empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)?1:0);
if ($nameorder && ((string) $nameorder != '2'))
{
$ret.=$firstname;