From 244a5f32644f4c575566abd36e128ecc2fe6675a Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Tue, 10 Aug 2021 10:05:45 +0700
Subject: [PATCH] MDL-72205 admin: admin_setting_configduration validation
 improvement

The write_setting() should only use the internal validation if no validation function was provided
---
 lib/adminlib.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 06e1aad4674..d25dbfd4a07 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -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);