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

FIX #4880

Browse Source
This commit is contained in:
Laurent Destailleur 2016-03-30 14:07:07 +02:00
parent 07e622a7f8
commit fa10f9e030
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/user/class/user.class.php
View File

@ -162,7 +162,7 @@ class User extends CommonObject
*/ */
function fetch($id='', $login='',$sid='',$loadpersonalconf=1, $entity=-1) function fetch($id='', $login='',$sid='',$loadpersonalconf=1, $entity=-1)
{ {
global $langs, $conf, $user; global $conf, $user;
// Clean parameters // Clean parameters
$login=trim($login); $login=trim($login);
@ -256,7 +256,7 @@ class User extends CommonObject
$this->country_id = $obj->country_id; $this->country_id = $obj->country_id;
$this->country_code = $obj->country_id?$obj->country_code:''; $this->country_code = $obj->country_id?$obj->country_code:'';
$this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):''; //$this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
$this->state_id = $obj->state_id; $this->state_id = $obj->state_id;
$this->state_code = $obj->state_code; $this->state_code = $obj->state_code;