Skip to content

Commit

Permalink
Uniformize code
Browse files Browse the repository at this point in the history
  • Loading branch information
eldy committed Jan 8, 2012
1 parent b3f1949 commit 2146ab0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions htdocs/core/class/html.form.class.php
Expand Up @@ -1007,7 +1007,7 @@ function select_dolusers($selected='',$htmlname='userid',$show_empty=0,$exclude=
$out='';

// On recherche les utilisateurs
$sql = "SELECT u.rowid, u.name, u.firstname, u.login, u.admin, u.entity";
$sql = "SELECT u.rowid, u.name as lastname, u.firstname, u.login, u.admin, u.entity";
if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
{
$sql.= ", e.label";
Expand Down Expand Up @@ -1045,8 +1045,8 @@ function select_dolusers($selected='',$htmlname='userid',$show_empty=0,$exclude=
$obj = $this->db->fetch_object($resql);

$userstatic->id=$obj->rowid;
$userstatic->nom=$obj->name;
$userstatic->prenom=$obj->firstname;
$userstatic->lastname=$obj->lastname;
$userstatic->firstname=$obj->firstname;

$disableline=0;
if (is_array($enableonly) && count($enableonly) && ! in_array($obj->rowid,$enableonly)) $disableline=1;
Expand Down

0 comments on commit 2146ab0

Please sign in to comment.