改进App类的run方法的返回值 改进Response类

This commit is contained in:
thinkphp
2016-06-16 11:00:49 +08:00
parent 5e32fa2880
commit e5740e5451
2 changed files with 7 additions and 12 deletions

View File

@@ -128,11 +128,13 @@ class App
// 输出数据到客户端
if ($data instanceof Response) {
return $data;
} else {
} elseif(!is_null($data)) {
// 默认自动识别响应输出类型
$isAjax = $request->isAjax();
$type = $isAjax ? Config::get('default_ajax_return') : Config::get('default_return_type');
return Response::create( is_null($data) ? '' : $data, $type);
return Response::create($data, $type);
} else {
return Response::create();
}
}