diff --git a/library/think/app.php b/library/think/app.php index 699758f9..206210c0 100644 --- a/library/think/app.php +++ b/library/think/app.php @@ -25,10 +25,6 @@ class App */ public static function run(array $config = []) { - if (version_compare(PHP_VERSION, '5.4.0', '<')) { - throw new Exception('require PHP > 5.4.0 !'); - } - // 初始化公共模块 self::initModule(COMMON_MODULE, $config); diff --git a/library/think/error.php b/library/think/error.php index bbe077e0..6a6e68ec 100644 --- a/library/think/error.php +++ b/library/think/error.php @@ -124,12 +124,12 @@ class Error if (Config::get('show_error_msg')) { $e['message'] = is_array($error) ? $error['message'] : $error; } else { - $e['message'] = C('error_message'); + $e['message'] = Config::get('error_message'); } } } // 包含异常页面模板 - $data = include Config::get('exception_tmpl'); - exit(Response::returnData($data)); + include Config::get('exception_tmpl'); + exit; } } diff --git a/library/think/route.php b/library/think/route.php index 393a8743..f855fa3e 100644 --- a/library/think/route.php +++ b/library/think/route.php @@ -273,7 +273,8 @@ class Route // 正则路由 if ($route instanceof \Closure) { // 执行闭包 - return self::invokeRegx($route, $matches); + $result = self::invokeRegx($route, $matches); + return is_array($result) ? $result : exit($result); } return self::parseRegex($matches, $route, $regx); } @@ -297,7 +298,8 @@ class Route if (false !== $match = self::match($regx, $rule)) { if ($route instanceof \Closure) { // 执行闭包 - return self::invokeRule($route, $match); + $result = self::invokeRule($route, $match); + return is_array($result) ? $result : exit($result); } return self::parseRule($rule, $route, $regx); }