moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-72205 admin: admin_setting_configduration validation improvement

Browse source 
The write_setting() should only use the internal validation if no validation function was provided
This commit is contained in:
Huong Nguyen 2021-08-10 10:05:45 +07:00
parent 5ea3545115
commit 244a5f3264
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/adminlib.php
View file

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