注释修正

This commit is contained in:
thinkphp
2016-05-23 14:33:28 +08:00
parent 5d2685cc85
commit 15df0ebf34
5 changed files with 4 additions and 4 deletions

View File

@@ -143,7 +143,7 @@ class Controller
public function validate($data, $validate, $message = [], $callback = null) public function validate($data, $validate, $message = [], $callback = null)
{ {
if (is_array($validate)) { if (is_array($validate)) {
$v = Loader::validate(Config::get('default_validate')); $v = Loader::validate();
$v->rule($validate); $v->rule($validate);
} else { } else {
if (strpos($validate, '.')) { if (strpos($validate, '.')) {

View File

@@ -59,7 +59,6 @@ class Error
* @param string $errfile 出错的文件 * @param string $errfile 出错的文件
* @param integer $errline 出错行号 * @param integer $errline 出错行号
* @param array $errcontext * @param array $errcontext
* @return bool true-禁止往下传播已处理过的异常
* @throws ErrorException * @throws ErrorException
*/ */
public static function appError($errno, $errstr, $errfile = '', $errline = 0, $errcontext = []) public static function appError($errno, $errstr, $errfile = '', $errline = 0, $errcontext = [])

View File

@@ -332,6 +332,7 @@ class Loader
*/ */
public static function validate($name = '', $layer = '', $appendSuffix = false) public static function validate($name = '', $layer = '', $appendSuffix = false)
{ {
$name = $name ?: Config::get('default_validate');
if (empty($name)) { if (empty($name)) {
return new Validate; return new Validate;
} }

View File

@@ -520,7 +520,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
if (!empty($this->validate)) { if (!empty($this->validate)) {
$info = $this->validate; $info = $this->validate;
if (is_array($info)) { if (is_array($info)) {
$validate = Loader::validate(Config::get('default_validate')); $validate = Loader::validate();
$validate->rule($info['rule']); $validate->rule($info['rule']);
$validate->message($info['msg']); $validate->message($info['msg']);
} else { } else {

View File

@@ -2,7 +2,7 @@
/** /**
* 用法: * 用法:
* T('controller/Jump'); * load_trait('controller/Jump');
* class index * class index
* { * {
* use \traits\controller\Jump; * use \traits\controller\Jump;