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

新增Jump相关测试用例

Browse Source
This commit is contained in:
Gaozhen Ying
2017-09-08 17:18:55 +08:00
committed by ThinkPHP
parent f3a47f30ff
commit 60d6be4627
4 changed files with 342 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/traits/controller/Jump.php
View File

@@ -36,8 +36,8 @@ trait Jump
*/
protected function success($msg = '', $url = null, $data = '', $wait = 3, array $header = [])
{
if (is_null($url) && isset($_SERVER["HTTP_REFERER"])) {
$url = $_SERVER["HTTP_REFERER"];
if (is_null($url) && !is_null(Request::instance()->server('HTTP_REFERER'))) {
$url = Request::instance()->server('HTTP_REFERER');
} elseif ('' !== $url) {
$url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url);
}
@@ -107,7 +107,7 @@ trait Jump
$result = [
'code' => $code,
'msg' => $msg,
'time' => $_SERVER['REQUEST_TIME'],
'time' => Request::instance()->server('REQUEST_TIME'),
'data' => $data,
];
$type = $type ?: $this->getResponseType();