From 2146ab0cc53aae48becd51ae89bd9753d2605c13 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 9 Jan 2012 00:53:31 +0100 Subject: [PATCH] Uniformize code --- htdocs/core/class/html.form.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 4b97d84e205a0..67c3e44fe879a 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -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"; @@ -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;