更新核心文件

This commit is contained in:
thinkphp
2015-03-26 16:15:35 +08:00
parent 40db699dc4
commit aa123aa8a2
11 changed files with 221 additions and 178 deletions

View File

@@ -91,10 +91,10 @@ class Url {
$path = explode($depr,$url);
$var = [];
$var[Config::get('var_action')] = !empty($path)?array_pop($path):ACTION_NAME;
if(Config::get('require_controller')) {
if(!defined('BIND_CONTROLLER')){
$var[Config::get('var_controller')] = !empty($path)?array_pop($path):CONTROLLER_NAME;
}
if(Config::get('require_module')) {
if(!defined('BIND_MODULE')){
$var[Config::get('var_module')] = !empty($path)?array_pop($path):MODULE_NAME;
}
}