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

修正方法

Browse Source
This commit is contained in:
thinkphp
2016-04-04 22:37:01 +08:00
parent 6e5658b0b9
commit 4b6115d051
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
library/think/db/Driver.php
View File

@@ -663,7 +663,7 @@ abstract class Driver
* @param mixed $condition 查询条件 * @param mixed $condition 查询条件
* @return Model * @return Model
*/ */
public function or($field, $op = null, $condition = null) public function whereOr($field, $op = null, $condition = null)
{ {
if ($field instanceof \Closure) { if ($field instanceof \Closure) {
$where[] = $field; $where[] = $field;
@@ -1566,7 +1566,8 @@ abstract class Driver
} }
// 执行闭包子查询 // 执行闭包子查询
protected function parseClosure($call,$show=true){ protected function parseClosure($call, $show = true)
{
$class = clone $this; $class = clone $this;
call_user_func_array($call, [ & $class]); call_user_func_array($call, [ & $class]);
return $class->buildSql($show); return $class->buildSql($show);