Controll更改为Controller

This commit is contained in:
thinkphp
2013-03-13 17:46:03 +08:00
parent 4b739dabd7
commit 7b1541e1f8
8 changed files with 25 additions and 25 deletions

View File

@@ -40,15 +40,15 @@ class ContentReplace {
}
define('ROOT_URL', rtrim(dirname(str_replace("\\","\/",$script_name)),'/'));
define('MODULE_URL', ROOT_URL.(Config::get('require_module')?'/'.MODULE_NAME:''));
define('CONTROLL_URL', MODULE_URL.(Config::get('require_controll')?'/'.CONTROLL_NAME:''));
define('ACTION_URL', CONTROLL_URL.'/'.ACTION_NAME);
define('CONTROLLER_URL', MODULE_URL.(Config::get('require_controller')?'/'.CONTROLLER_NAME:''));
define('ACTION_URL', CONTROLLER_URL.'/'.ACTION_NAME);
// 系统默认的特殊变量替换
$replace = array(
'__ROOT__' => ROOT_URL, // 当前网站地址
'__APP__' => MODULE_URL, // 当前项目地址
'__CONTROLL__' => CONTROLL_URL, // 当前操作地址
'__URL__' => CONTROLL_URL,
'__CONTROLL__' => CONTROLLER_URL, // 当前操作地址
'__URL__' => CONTROLLER_URL,
'__ACTION__' => ACTION_URL, // 当前操作地址
'__SELF__' => $_SERVER['PHP_SELF'], // 当前页面地址
'__PUBLIC__' => ROOT_URL.'/Public',// 站点公共目录

View File

@@ -36,9 +36,9 @@ class LocationTemplate {
$template = str_replace(':','/',$template);
if(''==$template) {
// 如果模板文件名为空 按照默认规则定位
$template = CONTROLL_NAME.'/'.ACTION_NAME;
$template = CONTROLLER_NAME.'/'.ACTION_NAME;
}elseif(false === strpos($template,'/')){
$template = CONTROLL_NAME.'/'.$template;
$template = CONTROLLER_NAME.'/'.$template;
}elseif(false === strpos($template,'.')) {
$template = $template;
}