Merge pull request #8535 from atm-greg/Fix_dolGetFirstLastname

fix #8521
This commit is contained in:
Laurent Destailleur 2018-04-11 14:54:15 +02:00 committed by GitHub
commit bc1515cb56
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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