From 4695dd45d442d759e25274f80fcd78b7f65284e4 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 30 Sep 2016 21:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=BD=AF=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E6=94=B9=E8=BF=9B=E6=A8=A1=E6=9D=BFsessio?=
 =?UTF-8?q?n=E5=92=8Ccookie=E5=8F=98=E9=87=8F=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Template.php          | 4 ++--
 library/traits/model/SoftDelete.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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');
     }