From f3fc4bb9a432f25a0876fd6f679233614836d28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=88=9A?= <liugang@easycorp.ltd>
Date: Wed, 17 May 2023 13:27:43 +0800
Subject: [PATCH] revert 5455d817d5b9a26c68d4b9f7705d03a2e34cbc93

revert * form: renamed the $config parameter to $fieldConfig to distinguish it from the global $config variable.
---
 lib/form/form.class.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/form/form.class.php b/lib/form/form.class.php
index 144d185ee6..6b58223164 100644
--- a/lib/form/form.class.php
+++ b/lib/form/form.class.php
@@ -104,22 +104,22 @@ class form extends baseFixer
      * Convert the field type.
      *
      * @param string $field
-     * @param array $fieldConfig
+     * @param array $config
      * @return void
      */
-    public function convertField(string $field, array $fieldConfig)
+    public function convertField(string $field, array $config)
     {
         global $app;
 
-        if(!isset($fieldConfig['type']))
+        if(!isset($config['type']))
         {
             if(!isset($this->errors[$field])) $this->errors[$field] = array();
             $this->errors[$field][] = "Field '{$field}' need defined type";
         }
 
-        if(isset($fieldConfig['required']) && $fieldConfig['required'])
+        if(isset($config['required']) && $config['required'])
         {
-            if(!isset($fieldConfig['default']) && (!isset($this->rawdata->$field) || $this->rawdata->$field === ''))
+            if(!isset($config['default']) && (!isset($this->rawdata->$field) || $this->rawdata->$field === ''))
             {
                 if(!isset($this->errors[$field])) $this->errors[$field] = array();
                 $fieldName = isset($app->lang->{$app->rawModule}->$field) ? $app->lang->{$app->rawModule}->$field : $field;
@@ -132,16 +132,16 @@ class form extends baseFixer
             $data = $this->rawdata->$field;
         }
 
-        if(isset($fieldConfig['default']) && !isset($this->rawdata->$field))
+        if(isset($config['default']) && !isset($this->rawdata->$field))
         {
-            $data = $fieldConfig['default'];
+            $data = $config['default'];
         }
 
-        $data = helper::convertType($data, $fieldConfig['type']);
+        $data = helper::convertType($data, $config['type']);
 
-        if(isset($fieldConfig['filter']))
+        if(isset($config['filter']))
         {
-            $data = $this->filter($data, $fieldConfig['filter']);
+            $data = $this->filter($data, $config['filter']);
         }
 
         $this->data->$field = $data;