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

改进Response类的redirect方法 Controller类的前置操作定义改进

Browse Source
This commit is contained in:
thinkphp
2016-02-14 23:48:25 +08:00
parent 00f226a6f9
commit 3b9c814f3c
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Controller.php
View File

@@ -56,10 +56,16 @@ class Controller
protected function beforeAction($method, $options = []) protected function beforeAction($method, $options = [])
{ {
if (isset($options['only'])) { if (isset($options['only'])) {
if (is_string($options['only'])) {
$options['only'] = explode(',', $options['only']);
}
if (!in_array(ACTION_NAME, $options['only'])) { if (!in_array(ACTION_NAME, $options['only'])) {
return; return;
} }
} elseif (isset($options['except'])) { } elseif (isset($options['except'])) {
if (is_string($options['except'])) {
$options['except'] = explode(',', $options['except']);
}
if (in_array(ACTION_NAME, $options['except'])) { if (in_array(ACTION_NAME, $options['except'])) {
return; return;
} }

2
library/think/Response.php
View File

@@ -230,7 +230,7 @@ class Response
public static function redirect($url, $params = []) public static function redirect($url, $params = [])
{ {
$http_response_code = 301; $http_response_code = 301;
if (in_array($params, [301, 302])) { if (is_int($params) && in_array($params, [301, 302])) {
$http_response_code = $params; $http_response_code = $params;
$params = []; $params = [];
} }