mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

去除 MODULE_NAME CONTROLLER_NAME ACTION_NAME 常量

Browse Source
This commit is contained in:
thinkphp
2016-06-01 18:34:36 +08:00
parent 4a4c53bf6b
commit ac0cb9be42
11 changed files with 123 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/view/driver/Think.php
View File

@@ -13,6 +13,7 @@ namespace think\view\driver;
use think\Exception;
use think\Log;
use think\Request;
use think\Template;
class Think
@@ -110,14 +111,16 @@ class Think
}
// 分析模板文件规则
if (defined('CONTROLLER_NAME') && 0 !== strpos($template, '/')) {
$request = Request::instance();
$controller = $request->controller();
if ($controller && 0 !== strpos($template, '/')) {
$depr = $this->config['view_depr'];
$template = str_replace(['/', ':'], $depr, $template);
if ('' == $template) {
// 如果模板文件名为空 按照默认规则定位
$template = str_replace('.', DS, CONTROLLER_NAME) . $depr . ACTION_NAME;
$template = str_replace('.', DS, $controller) . $depr . $request->action();
} elseif (false === strpos($template, $depr)) {
$template = str_replace('.', DS, CONTROLLER_NAME) . $depr . $template;
$template = str_replace('.', DS, $controller) . $depr . $template;
}
}
return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');