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

改进重定向的地址生成

Browse Source
This commit is contained in:
thinkphp
2016-09-26 11:33:47 +08:00
parent 9b16b0c24b
commit 9485a735e6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/response/Redirect.php
View File

@@ -67,7 +67,7 @@ class Redirect extends Response
*/ */
public function getTargetUrl() public function getTargetUrl()
{ {
return strpos($this->data, '://') ? $this->data : Url::build($this->data, $this->params); return (strpos($this->data, '://') || 0 === strpos($this->data, '/')) ? $this->data : Url::build($this->data, $this->params);
} }
public function params($params = []) public function params($params = [])

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

@@ -44,7 +44,7 @@ trait Jump
if (is_null($url) && isset($_SERVER["HTTP_REFERER"])) { if (is_null($url) && isset($_SERVER["HTTP_REFERER"])) {
$url = $_SERVER["HTTP_REFERER"]; $url = $_SERVER["HTTP_REFERER"];
} elseif ('' !== $url) { } elseif ('' !== $url) {
$url = strpos($url, '://') ? $url : Url::build($url); $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url);
} }
$result = [ $result = [
'code' => $code, 'code' => $code,
@@ -83,7 +83,7 @@ trait Jump
if (is_null($url)) { if (is_null($url)) {
$url = 'javascript:history.back(-1);'; $url = 'javascript:history.back(-1);';
} elseif ('' !== $url) { } elseif ('' !== $url) {
$url = strpos($url, '://') ? $url : Url::build($url); $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url);
} }
$result = [ $result = [
'code' => $code, 'code' => $code,