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

改进页面trace输出

Browse Source
This commit is contained in:
thinkphp
2016-05-25 16:03:15 +08:00
parent 7a9eeba565
commit 458cd82507
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Response.php
View File

@@ -53,8 +53,11 @@ class Response
if (isset($this->contentTypes[$this->type])) { if (isset($this->contentTypes[$this->type])) {
$this->contentType($this->contentTypes[$this->type]); $this->contentType($this->contentTypes[$this->type]);
} }
if(!empty($options)){
$this->options = array_merge($this->options, $options); $this->options = array_merge($this->options, $options);
}
// 方便获取某个类型的实例
self::$instance[$this->type] = $this;
} }
/** /**
@@ -97,6 +100,8 @@ class Response
$data = call_user_func_array($this->transform, [$data]); $data = call_user_func_array($this->transform, [$data]);
} }
define('RESPONSE_TYPE',$this->type);
// 处理输出数据 // 处理输出数据
$data = $this->output($data); $data = $this->output($data);

2
library/think/log/driver/Trace.php
View File

@@ -41,7 +41,7 @@ class Trace
*/ */
public function save(array $log = []) public function save(array $log = [])
{ {
if (IS_AJAX || IS_CLI || IS_API || 'html' != Config::get('default_return_type')) { if (IS_AJAX || IS_CLI || IS_API || 'html' != RESPONSE_TYPE) {
// ajax cli api方式下不输出 // ajax cli api方式下不输出
return false; return false;
} }