1、更换编辑器

2、内核升级
2016-12-10 12:21:08 +08:00
parent 766c26d25d
commit 06939cb0f1
389 changed files with 5944 additions and 41188 deletions
--- a/core/library/think/Response.php
+++ b/core/library/think/Response.php
@@ -133,7 +133,9 @@ class Response
        Hook::listen('response_end', $this);

        // 清空当次请求有效的数据
-        Session::flush();
+        if (!($this instanceof RedirectResponse)) {
+            Session::flush();
+        }
    }

    /**
@@ -282,7 +284,11 @@ class Response
     */
    public function getHeader($name = '')
    {
-        return !empty($name) ? $this->header[$name] : $this->header;
+        if (!empty($name)) {
+            return isset($this->header[$name]) ? $this->header[$name] : null;
+        } else {
+            return $this->header;
+        }
    }

    /**