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

Merge branch 'master' of https://github.com/top-think/think

Browse Source
This commit is contained in:
小陈叔叔
2016-01-13 14:02:48 +08:00
parent 793e267128 cf85daf81a
commit 0e204c8265
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/traits/model/Auto.php
View File

@@ -146,12 +146,12 @@ trait Auto
} else { } else {
$_auto = $this->options['auto']; $_auto = $this->options['auto'];
unset($this->options['auto']); unset($this->options['auto']);
if (empty($_auto) && !empty($this->_auto)) { if (empty($_auto) && !empty($this->auto)) {
$_auto = $this->_auto; $_auto = $this->auto;
} }
} }
} elseif (!empty($this->_auto)) { } elseif (!empty($this->auto)) {
$_auto = $this->_auto; $_auto = $this->auto;
} }
// 自动填充 // 自动填充
if (!empty($_auto)) { if (!empty($_auto)) {
@@ -248,12 +248,12 @@ trait Auto
} else { } else {
$_validate = $this->options['validate']; $_validate = $this->options['validate'];
unset($this->options['validate']); unset($this->options['validate']);
if (empty($_validate) && !empty($this->_validate)) { if (empty($_validate) && !empty($this->validate)) {
$_validate = $this->_validate; $_validate = $this->validate;
} }
} }
} elseif (!empty($this->_validate)) { } elseif (!empty($this->validate)) {
$_validate = $this->_validate; $_validate = $this->validate;
} }
// 属性验证 // 属性验证
if (!empty($_validate)) { if (!empty($_validate)) {