From 0d12b8b394d13ef7fb5cf00fc9520152055e6e0f Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 5 Sep 2016 17:43:31 +0800
Subject: [PATCH] =?UTF-8?q?redirect=E5=8A=A9=E6=89=8B=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=E6=8A=9B=E5=87=BAHttpResponseException=E5=BC=82=E5=B8=B8=20?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BD=BF=E7=94=A8return?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/helper.php b/helper.php
index 720d93f0..21249f30 100644
--- a/helper.php
+++ b/helper.php
@@ -488,7 +488,7 @@ if (!function_exists('redirect')) {
      * @param mixed         $url 重定向地址 支持Url::build方法的地址
      * @param array|integer $params 额外参数
      * @param integer       $code 状态码
-     * @return \think\response\Redirect
+     * @return void
      */
     function redirect($url = [], $params = [], $code = 302)
     {
@@ -496,7 +496,8 @@ if (!function_exists('redirect')) {
             $code   = $params;
             $params = [];
         }
-        return Response::create($url, 'redirect', $code)->params($params);
+        $response = Response::create($url, 'redirect', $code)->params($params);
+        throw new HttpResponseException($response);
     }
 }
 
@@ -534,6 +535,7 @@ if (!function_exists('token')) {
      * 生成表单令牌
      * @param string $name 令牌名称
      * @param mixed  $type 令牌生成方法
+     * @return string
      */
     function token($name = '__token__', $type = 'md5')
     {