From d1f9ab38e269a65c72ca8b6468fe1f49e0c041ad Mon Sep 17 00:00:00 2001 From: thinkphp Date: Tue, 17 May 2016 10:06:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3traits\controller\Jump?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/traits/controller/Jump.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/library/traits/controller/Jump.php b/library/traits/controller/Jump.php index 51711892..d318efbb 100644 --- a/library/traits/controller/Jump.php +++ b/library/traits/controller/Jump.php @@ -50,18 +50,18 @@ trait Jump $type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type'); - switch ($type) { - case 'html': - $result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str')) - ->fetch(Config::get('dispatch_success_tmpl'), $result); - $response = new Response($result, $type); - break; + switch (strtolower($type)) { case 'json': $response = new Json($result); break; case 'jsonp': $response = new Jsonp($result); break; + case 'html': + $result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str')) + ->fetch(Config::get('dispatch_success_tmpl'), $result); + default: + $response = new Response($result, $type); } return $response; } @@ -92,18 +92,18 @@ trait Jump $type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type'); - switch ($type) { - case 'html': - $result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str')) - ->fetch(Config::get('dispatch_error_tmpl'), $result); - $response = new Response($result, $type); - break; + switch (strtolower($type)) { case 'json': $response = new Json($result); break; case 'jsonp': $response = new Jsonp($result); break; + case 'html': + $result = ViewTemplate::instance(Config::get('template'), Config::get('view_replace_str')) + ->fetch(Config::get('dispatch_error_tmpl'), $result); + default: + $response = new Response($result, $type); } throw new HttpResponseException($response); }