Commit 34bab926 authored by Côme Chilliet's avatar Côme Chilliet

Merge branch '3710-support-users-with-no-password' into '1.4-dev'

Resolve "Support users with no password"

See merge request fusiondirectory/fd!602
parents 001d8e2b ca30d3ca
......@@ -208,7 +208,7 @@ class UserPasswordAttribute extends CompositeAttribute
if ($this->plugin->is_template && ($values[0] == '%askme%')) {
return '%askme%';
}
if (!$this->plugin->is_template && ($this->needPassword[$values[0]] || ($values[0] == 'empty')) && ($values[1] == '')) {
if (!$this->plugin->is_template && (!$this->attributes[0]->hasChanged()) && ($this->needPassword[$values[0]] || ($values[0] == 'empty')) && ($values[1] == '')) {
return $values[3];
}
$temp = passwordMethod::get_available_methods();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment