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

改进Route

Browse Source
This commit is contained in:
thinkphp
2016-09-09 20:40:39 +08:00
parent 766c410fe4
commit e63a162bc7
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/think/Route.php
View File

@@ -1339,11 +1339,13 @@ class Route
$result = call_user_func_array($val, [$matches]); $result = call_user_func_array($val, [$matches]);
} else { } else {
if (is_array($val)) { if (is_array($val)) {
$fields = explode('&', $val[1]); $fields = explode('&', $val[1]);
$model = $val[0]; $model = $val[0];
$exception = isset($val[2]) ? $val[2] : true;
} else { } else {
$fields = ['id']; $fields = ['id'];
$model = $val; $model = $val;
$exception = true;
} }
$where = []; $where = [];
$match = true; $match = true;
@@ -1356,7 +1358,7 @@ class Route
} }
} }
if ($match) { if ($match) {
$result = $model::where($where)->findOrFail(); $result = $model::where($where)->failException($exception)->find();
} }
} }
if (!empty($result)) { if (!empty($result)) {