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

error和success方法的url参数支持传入空字符串

Browse Source
This commit is contained in:
thinkphp
2016-02-15 19:41:20 +08:00
parent b53e4f3ea6
commit eb24c9fdee
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/think/Response.php
View File

@@ -135,7 +135,7 @@ class Response
* @access public * @access public
* @param mixed $data 要返回的数据 * @param mixed $data 要返回的数据
* @param integer $code 返回的code * @param integer $code 返回的code
* @param mixed $msg 提示信息 * @param string $msg 提示信息
* @param string $type 返回数据格式 * @param string $type 返回数据格式
* @return mixed * @return mixed
*/ */
@@ -159,11 +159,11 @@ class Response
* @access public * @access public
* @param mixed $msg 提示信息 * @param mixed $msg 提示信息
* @param mixed $data 返回的数据 * @param mixed $data 返回的数据
* @param mixed $url 跳转的URL地址 * @param string $url 跳转的URL地址
* @param mixed $wait 跳转等待时间 * @param integer $wait 跳转等待时间
* @return mixed * @return mixed
*/ */
public static function success($msg = '', $data = '', $url = '', $wait = 3) public static function success($msg = '', $data = '', $url = null, $wait = 3)
{ {
$code = 1; $code = 1;
if (is_numeric($msg)) { if (is_numeric($msg)) {
@@ -174,7 +174,7 @@ class Response
'code' => $code, 'code' => $code,
'msg' => $msg, 'msg' => $msg,
'data' => $data, 'data' => $data,
'url' => $url ?: $_SERVER["HTTP_REFERER"], 'url' => is_null($url) ? $_SERVER["HTTP_REFERER"] : $url,
'wait' => $wait, 'wait' => $wait,
]; ];
@@ -192,11 +192,11 @@ class Response
* @access public * @access public
* @param mixed $msg 提示信息 * @param mixed $msg 提示信息
* @param mixed $data 返回的数据 * @param mixed $data 返回的数据
* @param mixed $url 跳转的URL地址 * @param string $url 跳转的URL地址
* @param mixed $wait 跳转等待时间 * @param integer $wait 跳转等待时间
* @return mixed * @return mixed
*/ */
public static function error($msg = '', $data = '', $url = '', $wait = 3) public static function error($msg = '', $data = '', $url = null, $wait = 3)
{ {
$code = 0; $code = 0;
if (is_numeric($msg)) { if (is_numeric($msg)) {
@@ -207,7 +207,7 @@ class Response
'code' => $code, 'code' => $code,
'msg' => $msg, 'msg' => $msg,
'data' => $data, 'data' => $data,
'url' => $url ?: 'javascript:history.back(-1);', 'url' => is_null($url) ? 'javascript:history.back(-1);' : $url,
'wait' => $wait, 'wait' => $wait,
]; ];

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

@@ -22,12 +22,12 @@ trait Jump
* 操作错误跳转的快捷方法 * 操作错误跳转的快捷方法
* @access public * @access public
* @param mixed $msg 提示信息 * @param mixed $msg 提示信息
* @param mixed $url 跳转的URL地址 * @param string $url 跳转的URL地址
* @param mixed $data 返回的数据 * @param mixed $data 返回的数据
* @param mixed $wait 跳转等待时间 * @param integer $wait 跳转等待时间
* @return mixed * @return mixed
*/ */
public function error($msg = '', $url = '', $data = '', $wait = 3) public function error($msg = '', $url = null, $data = '', $wait = 3)
{ {
return Response::error($msg, $data, $url, $wait); return Response::error($msg, $data, $url, $wait);
} }
@@ -36,12 +36,12 @@ trait Jump
* 操作成功跳转的快捷方法 * 操作成功跳转的快捷方法
* @access public * @access public
* @param mixed $msg 提示信息 * @param mixed $msg 提示信息
* @param mixed $url 跳转的URL地址 * @param string $url 跳转的URL地址
* @param mixed $data 返回的数据 * @param mixed $data 返回的数据
* @param mixed $wait 跳转等待时间 * @param integer $wait 跳转等待时间
* @return mixed * @return mixed
*/ */
public function success($msg = '', $url = '', $data = '', $wait = 3) public function success($msg = '', $url = null, $data = '', $wait = 3)
{ {
return Response::success($msg, $data, $url, $wait); return Response::success($msg, $data, $url, $wait);
} }