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

变量名调整

Browse Source
This commit is contained in:
thinkphp
2017-01-18 22:01:28 +08:00
parent ebfcbac863
commit da2421113b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Model.php
View File

@@ -1415,18 +1415,18 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @access public * @access public
* @param string $model 模型名 * @param string $model 模型名
* @param string $foreignKey 关联外键 * @param string $foreignKey 关联外键
* @param string $otherKey 关联主键 * @param string $localKey 关联主键
* @param array $alias 别名定义（已经废弃） * @param array $alias 别名定义（已经废弃）
* @param string $joinType JOIN类型 * @param string $joinType JOIN类型
* @return BelongsTo * @return BelongsTo
*/ */
public function belongsTo($model, $foreignKey = '', $otherKey = '', $alias = [], $joinType = 'INNER') public function belongsTo($model, $foreignKey = '', $localKey = '', $alias = [], $joinType = 'INNER')
{ {
// 记录当前关联信息 // 记录当前关联信息
$model = $this->parseModel($model); $model = $this->parseModel($model);
$foreignKey = $foreignKey ?: $this->getForeignKey($model); $foreignKey = $foreignKey ?: $this->getForeignKey($model);
$otherKey = $otherKey ?: (new $model)->getPk(); $localKey = $localKey ?: (new $model)->getPk();
return new BelongsTo($this, $model, $foreignKey, $otherKey, $joinType); return new BelongsTo($this, $model, $foreignKey, $localKey, $joinType);
} }
/** /**