MDL-72205 admin: admin_setting_configduration validation improvement

The write_setting() should only use the internal validation if no validation function was provided
2021-09-20 09:18:32 +07:00
parent c71b2db9a3
commit df426e4a12
1 changed files with 3 additions and 3 deletions
@@ -3893,6 +3893,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 '';
        }
    }
@@ -3978,9 +3981,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);