diff --git a/library/think/Template.php b/library/think/Template.php index c82850c3..bff32bc6 100644 --- a/library/think/Template.php +++ b/library/think/Template.php @@ -977,14 +977,14 @@ class Template break; case 'COOKIE': if (isset($vars[2])) { - $parseStr = '$_COOKIE[\'' . $vars[1] . '\'][\'' . $vars[2] . '\']'; + $parseStr = '\\think\\Cookie::get(\'' . $vars[1] . '.' . $vars[2] . '\']'; } else { $parseStr = '\\think\\Cookie::get(\'' . $vars[1] . '\')'; } break; case 'SESSION': if (isset($vars[2])) { - $parseStr = '$_SESSION[\'' . $vars[1] . '\'][\'' . $vars[2] . '\']'; + $parseStr = '\\think\\Session::get(\'' . $vars[1] . '.' . $vars[2] . '\']'; } else { $parseStr = '\\think\\Session::get(\'' . $vars[1] . '\')'; } diff --git a/library/traits/model/SoftDelete.php b/library/traits/model/SoftDelete.php index cc279955..1ea0e9d8 100644 --- a/library/traits/model/SoftDelete.php +++ b/library/traits/model/SoftDelete.php @@ -38,7 +38,7 @@ trait SoftDelete public static function onlyTrashed() { $model = new static(); - $field = $this->getDeleteTimeField(); + $field = $model->getDeleteTimeField(); return $model->db()->where($field, 'exp', 'is not null'); }