diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index c94b99ee7bb..78f6906bb19 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1416,17 +1416,17 @@ class User extends CommonObject dol_syslog("User::send_password url=".$url); } $mailfile = new CMailFile( - $subject, - $this->email, - $conf->notification->email_from, - $mesg, - array(), - array(), - array(), + $subject, + $this->email, + $conf->notification->email_from, + $mesg, + array(), + array(), + array(), '', '', - 0, - $msgishtml + 0, + $msgishtml ); if ($mailfile->sendfile()) @@ -1990,6 +1990,7 @@ class User extends CommonObject * Return number of existing users * * @param string $limitTo Limit to 'active' or 'superadmin' users + * @param int $all Return for all entities * @return int Number of users */ function getNbOfUsers($limitTo='',$all=0) diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 622b411a840..3d908e06df1 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -1798,6 +1798,7 @@ llxFooter(); /** * Return if var element is ok + * * @param string $element Variable to check * @return boolean Return true of variable is not empty */