molong/sentcms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、bug的修复

Browse Source 
2、内核更新
This commit is contained in:
molong
2016-07-10 23:48:24 +08:00
parent f3fff63632
commit 1a0a29413a
50 changed files with 760 additions and 958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/library/traits/controller/Jump.php
View File

@@ -19,6 +19,7 @@ use think\exception\HttpResponseException;
use think\Request;
use think\Response;
use think\response\Redirect;
use think\Url;
use think\View as ViewTemplate;
trait Jump
@@ -39,11 +40,16 @@ trait Jump
$code = $msg;
$msg = '';
}
if (is_null($url) && isset($_SERVER["HTTP_REFERER"])) {
$url = $_SERVER["HTTP_REFERER"];
} else {
$url = preg_match('/^(https?:|\/)/', $url) ? $url : Url::build($url);
}
$result = [
'code' => $code,
'msg' => $msg,
'data' => $data,
'url' => is_null($url) && isset($_SERVER["HTTP_REFERER"]) ? $_SERVER["HTTP_REFERER"] : $url,
'url' => $url,
'wait' => $wait,
];
@@ -71,11 +77,16 @@ trait Jump
$code = $msg;
$msg = '';
}
if (is_null($url)) {
$url = 'javascript:history.back(-1);';
} else {
$url = preg_match('/^(https?:|\/)/', $url) ? $url : Url::build($url);
}
$result = [
'code' => $code,
'msg' => $msg,
'data' => $data,
'url' => is_null($url) ? 'javascript:history.back(-1);' : $url,
'url' => $url,
'wait' => $wait,
];
@@ -104,7 +115,7 @@ trait Jump
'msg' => $msg,
'time' => $_SERVER['REQUEST_TIME'],
'data' => $data,
];
];
$type = $type ?: $this->getResponseType();
return Response::create($result, $type);
}