From 7d7a0097d8a388c758b641504cdda0886b60e6c5 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 17 Jun 2016 17:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BSession=E7=B1=BB=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4active=E5=B1=9E=E6=80=A7=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Session.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/library/think/Session.php b/library/think/Session.php
index d32b5ad9..ade2a917 100644
--- a/library/think/Session.php
+++ b/library/think/Session.php
@@ -16,9 +16,7 @@ use think\exception\ClassNotFoundException;
 
 class Session
 {
-
     protected static $prefix = '';
-    protected static $active = false;
 
     /**
      * 设置或者获取session作用域（前缀）
@@ -100,7 +98,6 @@ class Session
         }
         if ($isDoStart) {
             session_start();
-            self::$active = true;
         }
     }
 
@@ -113,7 +110,7 @@ class Session
      */
     public static function set($name, $value = '', $prefix = null)
     {
-        !self::$active && self::init();
+        !isset($_SESSION) && self::init();
         $prefix = !is_null($prefix) ? $prefix : self::$prefix;
         if (strpos($name, '.')) {
             // 二维数组赋值
@@ -138,7 +135,7 @@ class Session
      */
     public static function get($name = '', $prefix = null)
     {
-        !self::$active && self::init();
+        !isset($_SESSION) && self::init();
         $prefix = !is_null($prefix) ? $prefix : self::$prefix;
         if ('' == $name) {
             // 获取全部的session
@@ -170,7 +167,7 @@ class Session
      */
     public static function delete($name, $prefix = null)
     {
-        !self::$active && self::init();
+        !isset($_SESSION) && self::init();
         $prefix = !is_null($prefix) ? $prefix : self::$prefix;
         if (strpos($name, '.')) {
             list($name1, $name2) = explode('.', $name);
@@ -195,7 +192,7 @@ class Session
      */
     public static function clear($prefix = null)
     {
-        !self::$active && self::init();
+        !isset($_SESSION) && self::init();
         $prefix = !is_null($prefix) ? $prefix : self::$prefix;
         if ($prefix) {
             unset($_SESSION[$prefix]);
@@ -212,7 +209,7 @@ class Session
      */
     public static function has($name, $prefix = null)
     {
-        !self::$active && self::init();
+        !isset($_SESSION) && self::init();
         $prefix = !is_null($prefix) ? $prefix : self::$prefix;
         if (strpos($name, '.')) {
             // 支持数组
@@ -230,7 +227,6 @@ class Session
     public static function start()
     {
         session_start();
-        self::$active = true;
     }
 
     /**