From b96c650a1eeb13d52f0fe83d9fe93315ef8e8dfc Mon Sep 17 00:00:00 2001 From: thinkphp Date: Thu, 14 Mar 2013 09:40:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Think/App.php | 6 +++--- Think/Url.php | 2 +- convention.php | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Think/App.php b/Think/App.php index 538be529..3cebbc6b 100644 --- a/Think/App.php +++ b/Think/App.php @@ -51,12 +51,12 @@ class App { self::dispatch($config); // 执行操作 - $instance = Loader::controller(CONTROLL_NAME); + $instance = Loader::controller(CONTROLLER_NAME); if(!$instance) { // 是否定义empty控制器 $instance = Loader::controller('empty'); if(!$instance){ - _404('controller not exists :'.CONTROLL_NAME); + _404('controller not exists :'.CONTROLLER_NAME); } } @@ -267,7 +267,7 @@ class App { } // 获取控制器名 - define('CONTROLLER_NAME', strtolower(isset($_GET[$var_controll])?$_GET[$var_controll]:$config['default_controll'])); + define('CONTROLLER_NAME', strtolower(isset($_GET[$var_controll])?$_GET[$var_controll]:$config['default_controller'])); // 获取操作名 define('ACTION_NAME', strtolower(isset($_GET[$var_action])?$_GET[$var_action]:$config['default_action'])); diff --git a/Think/Url.php b/Think/Url.php index 027a0930..af3a86c5 100644 --- a/Think/Url.php +++ b/Think/Url.php @@ -92,7 +92,7 @@ class Url { $var = array(); $var[Config::get('var_action')] = !empty($path)?array_pop($path):ACTION_NAME; if(Config::get('require_controller')) { - $var[Config::get('var_controller')] = !empty($path)?array_pop($path):CONTROLL_NAME; + $var[Config::get('var_controller')] = !empty($path)?array_pop($path):CONTROLLER_NAME; } if(Config::get('require_module')) { $var[Config::get('var_module')] = !empty($path)?array_pop($path):MODULE_NAME; diff --git a/convention.php b/convention.php index 08a85fb5..dfdd2ea8 100644 --- a/convention.php +++ b/convention.php @@ -27,9 +27,6 @@ return [ 'default_action' => 'index', // 默认操作名 'default_layer' => 'action', // 默认控制器层 'action_suffix' => '', // 操作方法后缀 - 'module_name' => '', // 当前模块名 - 'controll_name' => '', // 当前控制器名 - 'action_name' => '', // 当前操作名 'file_ext' => '.php', // 文件后缀 'url_model' => 1, // URL模式 'base_url' => $_SERVER["SCRIPT_NAME"], // 基础URL路径