mirror of
https://github.com/moodle/moodle.git
synced 2025-04-17 22:45:54 +02:00
MDL-72205 admin: admin_setting_configduration validation improvement
The write_setting() should only use the internal validation if no validation function was provided
This commit is contained in:
parent
5ea3545115
commit
244a5f3264
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user