Merge branch '12.x'

This commit is contained in:
z
2020-11-23 20:42:59 +08:00
230 changed files with 5568 additions and 1943 deletions
+2 -2
View File
@@ -331,7 +331,7 @@ class control extends baseControl
elseif($rule->type == 'system' and isset($_POST[$field->field]))
{
$checkFunc = 'check' . $rule->rule;
if(!validater::$checkFunc($_POST[$field->field]))
if(validater::$checkFunc($_POST[$field->field]) === false)
{
$error = zget($this->lang->error, $rule->rule, '');
if($error) $error = sprintf($error, $field->name);
@@ -342,7 +342,7 @@ class control extends baseControl
}
elseif($rule->type == 'regex' and isset($_POST[$field->field]))
{
if(!validater::checkREG($_POST[$field->field], $rule->rule)) $message[$field->field][] = sprintf($this->lang->error->reg, $field->name, $rule->rule);
if(validater::checkREG($_POST[$field->field], $rule->rule) === false) $message[$field->field][] = sprintf($this->lang->error->reg, $field->name, $rule->rule);
}
}
}