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

Traits/Think/Model/Auto 中的属性调整

Browse Source 
_validate 改成 validate
_auto 改成 auto

Traits/Think/Model/Relation中的_link属性改为link
This commit is contained in:
ThinkPHP
2013-04-25 15:21:01 +08:00
parent ecfe54147d
commit a6a7f8b655
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Traits/Think/Model/Relation.php
View File

@@ -18,7 +18,7 @@ define('MANY_TO_MANY',4);
trait Relation {
// 关联定义
protected $_link = array();
protected $link = array();
/**
* 得到关联的数据表名
@@ -103,8 +103,8 @@ trait Relation {
* @return array
*/
protected function getRelation(&$result,$name='',$return=false) {
if(!empty($this->_link)) {
foreach($this->_link as $key=>$val) {
if(!empty($this->link)) {
foreach($this->link as $key=>$val) {
$mappingName = !empty($val['mapping_name'])?$val['mapping_name']:$key; // 映射名称
if(empty($name) || true === $name || $mappingName == $name || (is_array($name) && in_array($mappingName,$name))) {
$mappingType = !empty($val['mapping_type'])?$val['mapping_type']:$val; // 关联类型
@@ -207,9 +207,9 @@ trait Relation {
// 数据无效返回
return false;
}
if(!empty($this->_link)) {
if(!empty($this->link)) {
// 遍历关联定义
foreach($this->_link as $key=>$val) {
foreach($this->link as $key=>$val) {
// 操作制定关联类型
$mappingName = $val['mapping_name']?$val['mapping_name']:$key; // 映射名称
if(empty($name) || true === $name || $mappingName == $name || (is_array($name) && in_array($mappingName,$name)) ) {