From ae478334160392d8cbec1944ad1262293c2b7241 Mon Sep 17 00:00:00 2001
From: Tiantian <ztrmail@gmail.com>
Date: Sat, 24 Nov 2012 19:48:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2ajax=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=97=B6IE=E5=87=BA=E7=8E=B0=E4=B8=8B=E8=BD=BD=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ThinkPHP/Lib/Core/Action.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ThinkPHP/Lib/Core/Action.class.php b/ThinkPHP/Lib/Core/Action.class.php
index 866ffdf8e..fad66111d 100644
--- a/ThinkPHP/Lib/Core/Action.class.php
+++ b/ThinkPHP/Lib/Core/Action.class.php
@@ -333,7 +333,7 @@ protected function ajaxReturn($data,$type='') {
         switch (strtoupper($type)){
             case 'JSON' :
                 // 返回JSON数据格式到客户端 包含状态信息
-                header('Content-Type:application/json; charset=utf-8');
+                header('Content-Type:text/html; charset=utf-8');
                 exit(json_encode($data));
             case 'XML'  :
                 // 返回xml格式数据