From 18f064cc69c6ccc433632903e0cee51d0c5993ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Aug 2015 15:18:36 +0200 Subject: [PATCH] Fix login is a mandatory field. --- htdocs/user/class/user.class.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index d20b4953a61..475b9d7fd2b 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -807,9 +807,9 @@ class User extends CommonObject /** * Create a user into database * - * @param User $user Objet user qui demande la creation - * @param int $notrigger 1 ne declenche pas les triggers, 0 sinon - * @return int <0 si KO, id compte cree si OK + * @param User $user Objet user doing creation + * @param int $notrigger 1=do not execute triggers, 0 otherwise + * @return int <0 if KO, id of created user if OK */ function create($user,$notrigger=0) { @@ -829,6 +829,12 @@ class User extends CommonObject $this->error = $langs->trans("ErrorBadEMail",$this->email); return -1; } + if (empty($this->login)) + { + $langs->load("errors"); + $this->error = $langs->trans("ErrorFieldRequired",$this->login); + return -1; + } $this->datec = dol_now(); @@ -1171,7 +1177,13 @@ class User extends CommonObject $this->error = $langs->trans("ErrorBadEMail",$this->email); return -1; } - + if (empty($this->login)) + { + $langs->load("errors"); + $this->error = $langs->trans("ErrorFieldRequired",$this->login); + return -1; + } + $this->db->begin(); // Update datas