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

控制器类的success和error方法url参数支持传入空字符串，则不做任何处理

Browse Source
This commit is contained in:
thinkphp
2016-07-24 22:06:48 +08:00
parent 760b1d971d
commit 646ce83ece
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,7 +42,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"];
} else { } elseif ('' !== $url) {
$url = preg_match('/^(https?:|\/)/', $url) ? $url : Url::build($url); $url = preg_match('/^(https?:|\/)/', $url) ? $url : Url::build($url);
} }
$result = [ $result = [
@@ -80,7 +80,7 @@ trait Jump
} }
if (is_null($url)) { if (is_null($url)) {
$url = 'javascript:history.back(-1);'; $url = 'javascript:history.back(-1);';
} else { } elseif ('' !== $url) {
$url = preg_match('/^(https?:|\/)/', $url) ? $url : Url::build($url); $url = preg_match('/^(https?:|\/)/', $url) ? $url : Url::build($url);
} }
$result = [ $result = [