mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 13:31:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

添加api接口的支持

Browse Source
This commit is contained in:
thinkphp
2015-05-12 15:34:04 +08:00
parent d886644b58
commit 36a84e75de
20 changed files with 247 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/model.php
View File

@@ -751,7 +751,7 @@ class Model {
if(!empty($this->tableName)) {
$tableName .= $this->tableName;
}else{
$tableName .= parse_name($this->name);
$tableName .= Loader::parseName($this->name);
}
$this->trueTableName = strtolower($tableName);
}
@@ -919,7 +919,7 @@ class Model {
}elseif(is_string($data)){
parse_str($data,$data);
}elseif(!is_array($data)){
E(Lang::get('_DATA_TYPE_INVALID_'));
throw new Exception(Lang::get('_DATA_TYPE_INVALID_'));
}
$this->data = $data;
return $this;
@@ -976,7 +976,7 @@ class Model {
$options = $union;
}
}else{
E(Lang::get('_DATA_TYPE_INVALID_'));
throw new Exception(Lang::get('_DATA_TYPE_INVALID_'));
}
$this->options['union'][] = $options;
return $this;