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

Merge pull request #383 from lyaohe/master

Browse Source 
error方法在ajax请求，默认返回url改为空
This commit is contained in:
ThinkPHP
2016-12-06 08:17:43 +08:00
committed by GitHub
parent 3e53f0f452 39ea6f812c
commit 81a8acb656
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ trait Jump
$msg = ''; $msg = '';
} }
if (is_null($url)) { if (is_null($url)) {
$url = 'javascript:history.back(-1);'; $url = Request::instance()->isAjax() ? '' : 'javascript:history.back(-1);';
} elseif ('' !== $url) { } elseif ('' !== $url) {
$url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url); $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url);
} }