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

修正软删除方法 改进模板session和cookie变量获取

Browse Source
This commit is contained in:
thinkphp
2016-09-30 21:32:23 +08:00
parent 497c13f127
commit 4695dd45d4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Template.php
View File

@@ -977,14 +977,14 @@ class Template
break; break;
case 'COOKIE': case 'COOKIE':
if (isset($vars[2])) { if (isset($vars[2])) {
$parseStr = '$_COOKIE[\'' . $vars[1] . '\'][\'' . $vars[2] . '\']'; $parseStr = '\\think\\Cookie::get(\'' . $vars[1] . '.' . $vars[2] . '\']';
} else { } else {
$parseStr = '\\think\\Cookie::get(\'' . $vars[1] . '\')'; $parseStr = '\\think\\Cookie::get(\'' . $vars[1] . '\')';
} }
break; break;
case 'SESSION': case 'SESSION':
if (isset($vars[2])) { if (isset($vars[2])) {
$parseStr = '$_SESSION[\'' . $vars[1] . '\'][\'' . $vars[2] . '\']'; $parseStr = '\\think\\Session::get(\'' . $vars[1] . '.' . $vars[2] . '\']';
} else { } else {
$parseStr = '\\think\\Session::get(\'' . $vars[1] . '\')'; $parseStr = '\\think\\Session::get(\'' . $vars[1] . '\')';
} }

2
library/traits/model/SoftDelete.php
View File

@@ -38,7 +38,7 @@ trait SoftDelete
public static function onlyTrashed() public static function onlyTrashed()
{ {
$model = new static(); $model = new static();
$field = $this->getDeleteTimeField(); $field = $model->getDeleteTimeField();
return $model->db()->where($field, 'exp', 'is not null'); return $model->db()->where($field, 'exp', 'is not null');
} }