Merge branch 'MDL-76109-401' of https://github.com/meirzamoodle/moodle into MOODLE_401_STABLE

This commit is contained in:
Ilya Tregubov 2023-12-06 15:43:39 +08:00
commit 2ff0e12b24
2 changed files with 4 additions and 2 deletions

View File

@ -1113,7 +1113,9 @@ function signup_validate_data($data, $files) {
// Construct fake user object to check password policy against required information.
$tempuser = new stdClass();
$tempuser->id = 1;
// To prevent errors with check_password_policy(),
// the temporary user and the guest must not share the same ID.
$tempuser->id = (int)$CFG->siteguest + 1;
$tempuser->username = $data['username'];
$tempuser->firstname = $data['firstname'];
$tempuser->lastname = $data['lastname'];

View File

@ -4966,7 +4966,7 @@ function get_complete_user_data($field, $value, $mnethostid = null, $throwexcept
function check_password_policy($password, &$errmsg, $user = null) {
global $CFG;
if (!empty($CFG->passwordpolicy)) {
if (!empty($CFG->passwordpolicy) && !isguestuser($user)) {
$errmsg = '';
if (core_text::strlen($password) < $CFG->minpasswordlength) {
$errmsg .= '<div>'. get_string('errorminpasswordlength', 'auth', $CFG->minpasswordlength) .'</div>';