From 16dad1e74810480ffb31edc0aa2eaaab2c6e57bf Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 22 Mar 2016 22:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96validate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Validate.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/library/think/Validate.php b/library/think/Validate.php
index 17540de0..907536dd 100644
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -232,11 +232,6 @@ class Validate
 
         // 分析验证规则
         $scene = $this->getScene($scene);
-        // 读取提示信息
-        if (isset($rules['__message__'])) {
-            $this->message($rules['__message__']);
-            unset($rules['__message__']);
-        }
 
         foreach ($rules as $key => $item) {
             // field => rule1|rule2... field=>['rule1','rule2',...]
@@ -259,6 +254,7 @@ class Validate
             } else {
                 $title = $key;
             }
+
             // 场景检测
             if (!empty($scene)) {
                 if ($scene instanceof \Closure && !call_user_func_array($scene, [$key, &$data])) {
@@ -332,6 +328,7 @@ class Validate
                     } else {
                         $info = $type = $key;
                     }
+
                     // 如果不是require 有数据才会行验证
                     if (0 === strpos($info, 'require') || !empty($value)) {
                         // 验证类型