改进confirm验证规则支持 password 及 password_confirm 自动规则识别

2026-07-01 12:42:48 +08:00 · 2016-12-06 14:23:08 +08:00
parent 1cff11b9cc
commit 7ce4d935f6
1 changed files with 10 additions and 2 deletions
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -422,13 +422,21 @@ class Validate
    /**
     * 验证是否和某个字段的值一致
     * @access protected
-     * @param mixed     $value  字段值
+     * @param mixed     $value 字段值
     * @param mixed     $rule  验证规则
     * @param array     $data  数据
+     * @param string    $field 字段名
     * @return bool
     */
-    protected function confirm($value, $rule, $data)
+    protected function confirm($value, $rule, $data, $field)
    {
+        if ('' == $rule) {
+            if (strpos($field, '_confirm')) {
+                $rule = strstr($field, '_confirm', true);
+            } else {
+                $rule = $field . '_confirm';
+            }
+        }
        return $this->getDataValue($data, $rule) == $value;
    }