molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新内核

Browse Source
This commit is contained in:
molong
2016-11-18 11:14:26 +08:00
parent 9074eb1d89
commit 860da138c9
36 changed files with 754 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/library/traits/model/SoftDelete.php
View File

@@ -27,7 +27,8 @@ trait SoftDelete
public static function withTrashed()
{
$model = new static();
return $model->db();
$field = $model->getDeleteTimeField(true);
return $model->db(false)->removeWhereField($field);
}
/**
@@ -38,8 +39,8 @@ trait SoftDelete
public static function onlyTrashed()
{
$model = new static();
$field = $model->getDeleteTimeField();
return $model->db()->where($field, 'exp', 'is not null');
$field = $model->getDeleteTimeField(true);
return $model->db(false)->where($field, 'exp', 'is not null');
}
/**
@@ -138,7 +139,8 @@ trait SoftDelete
$field = $this->db(false)->getTable() . '.' . $field;
}
if (!$read && strpos($field, '.')) {
list($alias, $field) = explode('.', $field);
$array = explode('.', $field);
$field = array_pop($array);
}
return $field;
}