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

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2023-01-03 11:34:25 +01:00
commit e5a5237452
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1352,10 +1352,11 @@ class User extends CommonObject
$error = 0; $error = 0;
// Check parameters // Check parameters
if (isset($this->statut) && $this->statut == $status) { if (isset($this->statut)) {
return 0; if ($this->statut == $status) {
} return 0;
if (isset($this->status) && $this->status == $status) { }
} elseif (isset($this->status) && $this->status == $status) {
return 0; return 0;
} }
@ -3258,7 +3259,8 @@ class User extends CommonObject
$this->iplastlogin = '127.0.0.1'; $this->iplastlogin = '127.0.0.1';
$this->datepreviouslogin = $now; $this->datepreviouslogin = $now;
$this->ippreviouslogin = '127.0.0.1'; $this->ippreviouslogin = '127.0.0.1';
$this->statut = 1; $this->statut = 1; // deprecated
$this->status = 1;
$this->entity = 1; $this->entity = 1;
return 1; return 1;