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

改进Route类setRule方法 修正BelongsToMany类的attach方法

Browse Source
This commit is contained in:
thinkphp
2016-12-22 17:55:35 +08:00
parent 6eedbc5a0a
commit 3a78c93d11
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Route.php
View File

@@ -296,12 +296,14 @@ class Route
} elseif ('$' == substr($rule, -1, 1)) { } elseif ('$' == substr($rule, -1, 1)) {
// 是否完整匹配 // 是否完整匹配
$option['complete_match'] = true; $option['complete_match'] = true;
$rule = substr($rule, 0, -1);
} }
} elseif (empty($option['complete_match']) && '$' == substr($rule, -1, 1)) { } elseif (empty($option['complete_match']) && '$' == substr($rule, -1, 1)) {
// 是否完整匹配 // 是否完整匹配
$option['complete_match'] = true; $option['complete_match'] = true;
$rule = substr($rule, 0, -1); }
if (true == $option['complete_match'] && '$' == substr($rule, -1, 1)) {
$rule = substr($rule, 0, -1);
} }
if ('/' != $rule || $group) { if ('/' != $rule || $group) {

3
library/think/model/relation/BelongsToMany.php
View File

@@ -13,6 +13,7 @@ namespace think\model\relation;
use think\Db; use think\Db;
use think\db\Query; use think\db\Query;
use think\Exception;
use think\Model; use think\Model;
use think\model\Pivot; use think\model\Pivot;
use think\model\Relation; use think\model\Relation;
@@ -269,7 +270,7 @@ class BelongsToMany extends Relation
$pk = $this->parent->getPk(); $pk = $this->parent->getPk();
$pivot[$this->localKey] = $this->parent->$pk; $pivot[$this->localKey] = $this->parent->$pk;
$pivot[$this->foreignKey] = $id; $pivot[$this->foreignKey] = $id;
return $this->query->table($this->middle)->insert($pivot); return $this->query->table($this->middle)->insert($pivot, true);
} else { } else {
throw new Exception('miss relation data'); throw new Exception('miss relation data');
} }