diff --git a/convention.php b/convention.php index 255afbc155..d4d94782e9 100644 --- a/convention.php +++ b/convention.php @@ -71,8 +71,6 @@ 'pathinfo_depr' => '/', // 获取当前页面地址的系统变量 默认为REQUEST_URI 'url_request_uri' => 'REQUEST_URI', - // 控制器版本参数 - 'var_version' => 'v', // 基础URL路径 'base_url' => $_SERVER["SCRIPT_NAME"], // URL伪静态后缀 diff --git a/library/think/App.php b/library/think/App.php index 857a733f2f..291564cb49 100644 --- a/library/think/App.php +++ b/library/think/App.php @@ -224,7 +224,7 @@ private static function module($result, $config) // 安全检测 throw new Exception('illegal controller name:' . CONTROLLER_NAME, 10000); } - $instance = Loader::controller(CONTROLLER_NAME, '', Config::get('empty_controller'), Input::get(Config::get('var_version'))); + $instance = Loader::controller(CONTROLLER_NAME, '', Config::get('empty_controller')); // 获取当前操作名 $action = ACTION_NAME . Config::get('action_suffix'); diff --git a/library/think/Loader.php b/library/think/Loader.php index 24b1c18539..82a890af1c 100644 --- a/library/think/Loader.php +++ b/library/think/Loader.php @@ -322,10 +322,9 @@ public static function model($name = '', $layer = MODEL_LAYER) * @param string $name 资源地址 * @param string $layer 控制层名称 * @param string $empty 空控制器名称 - * @param string $version 版本号 例如 1.0 1.2.3 * @return Object|false */ - public static function controller($name, $layer = '', $empty = '', $version = null) + public static function controller($name, $layer = '', $empty = '') { static $_instance = []; $layer = $layer ?: CONTROLLER_LAYER; @@ -338,12 +337,9 @@ public static function controller($name, $layer = '', $empty = '', $version = nu $module = APP_MULTI_MODULE ? MODULE_NAME : ''; } $class = self::parseClass($module, $layer, $name); - if ($version) { - $filename = APP_PATH . str_replace(APP_NAMESPACE . '\\', '', dirname($class)) . DS . $version . DS . basename($class) . EXT; - if (is_file($filename)) { - require $filename; - } - } + // controller_load + APP_HOOK && Hook::listen('controller_load', $class); + if (class_exists($class)) { $action = new $class; $_instance[$name . $layer] = $action;