mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 15:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Model类和Controller类的failException更改为 validateFailException 避免和Query类的failException方法冲突

Browse Source
This commit is contained in:
thinkphp
2016-06-12 14:06:36 +08:00
parent 9023041e6b
commit 659900ab91
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Controller.php
View File

@@ -149,7 +149,7 @@ class Controller
* @param bool $fail 是否抛出异常 * @param bool $fail 是否抛出异常
* @return $this * @return $this
*/ */
protected function failException($fail = true) protected function validateFailException($fail = true)
{ {
$this->failException = $fail; $this->failException = $fail;
return $this; return $this;

2
library/think/Model.php
View File

@@ -740,7 +740,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @param bool $fail 是否抛出异常 * @param bool $fail 是否抛出异常
* @return $this * @return $this
*/ */
public function failException($fail = true) public function validateFailException($fail = true)
{ {
$this->failException = $fail; $this->failException = $fail;
return $this; return $this;