Merge branch 'MDL-72205-master' of git://github.com/HuongNV13/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2021-09-20 18:58:56 +02:00
commit 9c6489db36

View File

@ -3923,6 +3923,9 @@ class admin_setting_configduration extends admin_setting {
if ($this->validatefunction) {
return call_user_func($this->validatefunction, $data);
} else {
if ($data < 0) {
return get_string('errorsetting', 'admin');
}
return '';
}
}
@ -4008,9 +4011,6 @@ class admin_setting_configduration extends admin_setting {
}
$seconds = (int)($data['v']*$data['u']);
if ($seconds < 0) {
return get_string('errorsetting', 'admin');
}
// Validate the new setting.
$error = $this->validate_setting($seconds);