From 659900ab914061c1616558ba43db47aa0472b057 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 12 Jun 2016 14:06:36 +0800
Subject: [PATCH] =?UTF-8?q?Model=E7=B1=BB=E5=92=8CController=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84failException=E6=9B=B4=E6=94=B9=E4=B8=BA=20validateFai?=
 =?UTF-8?q?lException=20=E9=81=BF=E5=85=8D=E5=92=8CQuery=E7=B1=BB=E7=9A=84?=
 =?UTF-8?q?failException=E6=96=B9=E6=B3=95=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Controller.php | 2 +-
 library/think/Model.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/think/Controller.php b/library/think/Controller.php
index 503f1884..03af3da6 100644
--- a/library/think/Controller.php
+++ b/library/think/Controller.php
@@ -149,7 +149,7 @@ class Controller
      * @param bool $fail 是否抛出异常
      * @return $this
      */
-    protected function failException($fail = true)
+    protected function validateFailException($fail = true)
     {
         $this->failException = $fail;
         return $this;
diff --git a/library/think/Model.php b/library/think/Model.php
index d7f5644e..4815540d 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -740,7 +740,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
      * @param bool $fail 是否抛出异常
      * @return $this
      */
-    public function failException($fail = true)
+    public function validateFailException($fail = true)
     {
         $this->failException = $fail;
         return $this;