mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-05 22:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

代码和注释规范

Browse Source
This commit is contained in:
thinkphp
2016-01-04 08:47:36 +08:00
parent 4eb78d2229
commit 7ceb302e34
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/response.php
View File

@@ -176,11 +176,8 @@ class Response
'wait' => $wait,
];
if (IS_AJAX) {
$type = Config::get('default_ajax_return');
} else {
$type = Config::get('default_return_type');
}
$type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type');
if ('html' == $type) {
$result = \think\View::instance()->fetch(Config::get('dispatch_jump_tmpl'), $result);
}
@@ -212,11 +209,8 @@ class Response
'wait' => $wait,
];
if (IS_AJAX) {
$type = Config::get('default_ajax_return');
} else {
$type = Config::get('default_return_type');
}
$type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type');
if ('html' == $type) {
$result = \think\View::instance()->fetch(Config::get('dispatch_jump_tmpl'), $result);
}