From 1b31bfafb88307c866558975ea05afc46ee693ab Mon Sep 17 00:00:00 2001
From: huangdijia <huangdijia@gmail.com>
Date: Wed, 9 Dec 2015 15:12:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=20traits\think\controller\aj?=
 =?UTF-8?q?ax::result?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 traits/think/controller/ajax.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/traits/think/controller/ajax.php b/traits/think/controller/ajax.php
index 59019a96..8aed19e2 100644
--- a/traits/think/controller/ajax.php
+++ b/traits/think/controller/ajax.php
@@ -27,18 +27,13 @@ trait Ajax
      */
     public function result($data = '', $msg = '', $code = 0, $url = '', $wait = 0)
     {
-        $result = [
+        return [
             'code' => $code,
             'msg'  => $msg,
             'data' => $data,
             'url'  => $url,
             'wait' => $wait,
         ];
-        if ('html' == Config::get('default_return_type')) {
-            return $this->fetch(Config::get('dispatch_jump_tmpl'), $result);
-        } else {
-            return $result;
-        }
     }
 
     /**