修正Url类对驼峰控制器名的自动转换

This commit is contained in:
thinkphp
2016-02-22 20:22:49 +08:00
parent fe98db2c1e
commit 17a78925ee

View File

@@ -129,11 +129,11 @@ class Url
// 空字符串输出当前的 模块/控制器/操作 // 空字符串输出当前的 模块/控制器/操作
$url = $module . CONTROLLER_NAME . '/' . ACTION_NAME; $url = $module . CONTROLLER_NAME . '/' . ACTION_NAME;
} else { } else {
$path = explode('/', $url); $path = explode('/', $url);
$len = count($path); $action = array_pop($path);
if ($len < 3) { $controller = empty($path) ? CONTROLLER_NAME : (Config::get('url_controller_convert') ? Loader::parseName(array_pop($path)) : array_pop($path));
$url = $module . (1 == $len ? CONTROLLER_NAME . '/' : '') . $url; $module = empty($path) ? $module : array_pop($path);
} $url = ($module ? $module . '/' : '') . $controller . '/' . $action;
} }
} }
return $url; return $url;