Skip to content
Snippets Groups Projects
Commit 932c36e6 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge pull request #568 from FHenry/3.3

CheckStyle
parents c730aff8 3e05581c
No related branches found
No related tags found
No related merge requests found
...@@ -909,14 +909,14 @@ class User extends CommonObject ...@@ -909,14 +909,14 @@ class User extends CommonObject
$this->admin = 0; $this->admin = 0;
$this->nom = $contact->nom; // TODO deprecated $this->nom = $contact->nom; // TODO deprecated
$this->prenom = $contact->prenom; // TODO deprecated $this->prenom = $contact->prenom; // TODO deprecated
$this->lastname = $contact->nom; $this->lastname = $contact->lastname;
$this->firstname = $contact->prenom; $this->firstname = $contact->firstname;
$this->email = $contact->email; $this->email = $contact->email;
$this->office_phone = $contact->phone_pro; $this->office_phone = $contact->phone_pro;
$this->office_fax = $contact->fax; $this->office_fax = $contact->fax;
$this->user_mobile = $contact->phone_mobile; $this->user_mobile = $contact->phone_mobile;
if (empty($login)) $login=strtolower(substr($contact->prenom, 0, 4)) . strtolower(substr($contact->nom, 0, 4)); if (empty($login)) $login=strtolower(substr($contact->firstname, 0, 4)) . strtolower(substr($contact->lastname, 0, 4));
$this->login = $login; $this->login = $login;
$this->db->begin(); $this->db->begin();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment