Merge branch 'fixbug/liumengyi_fixbug' into 'master'
* Fix bug for can no password. See merge request easycorp/zentaopms!6786
This commit is contained in:
@@ -862,7 +862,7 @@ class userModel extends model
|
||||
$_POST['password1'] = trim($_POST['password1']);
|
||||
$_POST['password2'] = trim($_POST['password2']);
|
||||
if(!$canNoPassword and empty($_POST['password1'])) dao::$errors['password1'][] = sprintf($this->lang->error->notempty, $this->lang->user->password) . '<br/>';
|
||||
if($this->post->password1 != false)
|
||||
if(!$canNoPassword and $this->post->password1 != false)
|
||||
{
|
||||
if(isset($this->config->safe->mode) and ($this->post->passwordStrength < $this->config->safe->mode)) dao::$errors['password1'][] = zget($this->lang->user->placeholder->passwordStrengthCheck, $this->config->safe->mode, $this->lang->user->weakPassword) . '<br/>';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user