mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 21:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

命名规范调整

Browse Source
This commit is contained in:
thinkphp
2013-03-14 09:40:43 +08:00
parent 7b1541e1f8
commit b96c650a1e
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Think/App.php
View File

@@ -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']));

2
Think/Url.php
View File

@@ -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;