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

修正

Browse Source
This commit is contained in:
thinkphp
2017-05-12 15:24:37 +08:00
parent ea83a28d7e
commit c78b8deea5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Response.php
View File

@@ -53,7 +53,7 @@ class Response
$this->options = array_merge($this->options, $options); $this->options = array_merge($this->options, $options);
} }
$this->contentType($this->contentType, $this->charset); $this->contentType($this->contentType, $this->charset);
$this->header = $header; $this->header = array_merge($this->header, $header);
$this->code = $code; $this->code = $code;
} }