From 15df0ebf342a5bba54c40e304a4f4d913fa734e2 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 23 May 2016 14:33:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Controller.php       | 2 +-
 library/think/Error.php            | 1 -
 library/think/Loader.php           | 1 +
 library/think/Model.php            | 2 +-
 library/traits/controller/Jump.php | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/think/Controller.php b/library/think/Controller.php
index ce5c0311..bfaf7da2 100644
--- a/library/think/Controller.php
+++ b/library/think/Controller.php
@@ -143,7 +143,7 @@ class Controller
     public function validate($data, $validate, $message = [], $callback = null)
     {
         if (is_array($validate)) {
-            $v = Loader::validate(Config::get('default_validate'));
+            $v = Loader::validate();
             $v->rule($validate);
         } else {
             if (strpos($validate, '.')) {
diff --git a/library/think/Error.php b/library/think/Error.php
index a1541282..9de97c88 100644
--- a/library/think/Error.php
+++ b/library/think/Error.php
@@ -59,7 +59,6 @@ class Error
      * @param  string  $errfile 出错的文件
      * @param  integer $errline 出错行号
      * @param array    $errcontext
-     * @return bool true-禁止往下传播已处理过的异常
      * @throws ErrorException
      */
     public static function appError($errno, $errstr, $errfile = '', $errline = 0, $errcontext = [])
diff --git a/library/think/Loader.php b/library/think/Loader.php
index 8527db0e..4509c58b 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -332,6 +332,7 @@ class Loader
      */
     public static function validate($name = '', $layer = '', $appendSuffix = false)
     {
+        $name = $name ?: Config::get('default_validate');
         if (empty($name)) {
             return new Validate;
         }
diff --git a/library/think/Model.php b/library/think/Model.php
index 00f5a3f4..239ebb1b 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -520,7 +520,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         if (!empty($this->validate)) {
             $info = $this->validate;
             if (is_array($info)) {
-                $validate = Loader::validate(Config::get('default_validate'));
+                $validate = Loader::validate();
                 $validate->rule($info['rule']);
                 $validate->message($info['msg']);
             } else {
diff --git a/library/traits/controller/Jump.php b/library/traits/controller/Jump.php
index fb469423..6d2b9967 100644
--- a/library/traits/controller/Jump.php
+++ b/library/traits/controller/Jump.php
@@ -2,7 +2,7 @@
 
 /**
  * 用法：
- * T('controller/Jump');
+ * load_trait('controller/Jump');
  * class index
  * {
  *     use \traits\controller\Jump;