From 37527368b4a2ce9f650c43583b3a354b867c1d51 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Fri, 7 Jul 2017 11:35:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/response/Redirect.php | 2 +- library/traits/controller/Jump.php | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/library/think/response/Redirect.php b/library/think/response/Redirect.php index 373443ce..0ea90a48 100644 --- a/library/think/response/Redirect.php +++ b/library/think/response/Redirect.php @@ -67,7 +67,7 @@ class Redirect extends Response */ public function getTargetUrl() { - if (strpos($this->data, '://') || (strpos($this->data, '/') && empty($this->params))) { + if (strpos($this->data, '://') || (0 === strpos($this->data, '/') && empty($this->params))) { return $this->data; } else { return Url::build($this->data, $this->params); diff --git a/library/traits/controller/Jump.php b/library/traits/controller/Jump.php index 6e6f2dec..761544c6 100644 --- a/library/traits/controller/Jump.php +++ b/library/traits/controller/Jump.php @@ -36,18 +36,13 @@ trait Jump */ protected function success($msg = '', $url = null, $data = '', $wait = 3, array $header = []) { - $code = 1; - if (is_numeric($msg)) { - $code = $msg; - $msg = ''; - } if (is_null($url) && isset($_SERVER["HTTP_REFERER"])) { $url = $_SERVER["HTTP_REFERER"]; } elseif ('' !== $url) { $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url); } $result = [ - 'code' => $code, + 'code' => 1, 'msg' => $msg, 'data' => $data, 'url' => $url, @@ -75,18 +70,13 @@ trait Jump */ protected function error($msg = '', $url = null, $data = '', $wait = 3, array $header = []) { - $code = 0; - if (is_numeric($msg)) { - $code = $msg; - $msg = ''; - } if (is_null($url)) { $url = Request::instance()->isAjax() ? '' : 'javascript:history.back(-1);'; } elseif ('' !== $url) { $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Url::build($url); } $result = [ - 'code' => $code, + 'code' => 0, 'msg' => $msg, 'data' => $data, 'url' => $url,