Merge pull request #383 from lyaohe/master

error方法在ajax请求,默认返回url改为空
This commit is contained in:
ThinkPHP
2016-12-06 08:17:43 +08:00
committed by GitHub

View File

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