lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If firstname not define, use lastname

Browse Source
This commit is contained in:
Laurent Destailleur 2015-10-20 00:47:35 +02:00
parent 921faa0410
commit e70bb28be7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@ -4384,7 +4384,7 @@ function get_date_range($date_start,$date_end,$format = '',$outputlangs='', $wit
* *
* @param string $firstname Firstname * @param string $firstname Firstname
* @param string $lastname Lastname * @param string $lastname Lastname
* @param int $nameorder -1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname * @param int $nameorder -1=Auto, 0=Lastname+Firstname, 1=Firstname+Lastname, 2=Firstname
* @return string Firstname + lastname or Lastname + firstname * @return string Firstname + lastname or Lastname + firstname
*/ */
function dolGetFirstLastname($firstname,$lastname,$nameorder=-1) function dolGetFirstLastname($firstname,$lastname,$nameorder=-1)

2
htdocs/main.inc.php
View File

@ -1492,7 +1492,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
// Login name with tooltip // Login name with tooltip
$toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">'; $toprightmenu.='<div class="inline-block nowrap"><div class="inline-block login_block_elem login_block_elem_name" style="padding: 0px;">';
$toprightmenu.=$user->getNomurl(0, '', true, 0, 11, 0, 'firstname','alogin'); $toprightmenu.=$user->getNomurl(0, '', true, 0, 11, 0, ($user->firstname ? 'firstname' : -1),'alogin');
$toprightmenu.='</div></div>'; $toprightmenu.='</div></div>';
$toprightmenu.='</div>'; $toprightmenu.='</div>';