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

改进View类

Browse Source
This commit is contained in:
thinkphp
2016-02-02 17:57:08 +08:00
parent 8651502d83
commit 21da52db63
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/View.php
View File

@@ -214,7 +214,7 @@ class View
$template = str_replace(['/', ':'], $depr, $template); $template = str_replace(['/', ':'], $depr, $template);
// 获取当前模块 // 获取当前模块
$module = MODULE_NAME; $module = defined('MODULE_NAME') ? MODULE_NAME : '';
if (strpos($template, '@')) { if (strpos($template, '@')) {
// 跨模块调用模版文件 // 跨模块调用模版文件
list($module, $template) = explode('@', $template); list($module, $template) = explode('@', $template);
@@ -223,11 +223,13 @@ class View
defined('THEME_PATH') || define('THEME_PATH', $this->getThemePath($module)); defined('THEME_PATH') || define('THEME_PATH', $this->getThemePath($module));
// 分析模板文件规则 // 分析模板文件规则
if ('' == $template) { if (defined('CONTROLLER_NAME')) {
// 如果模板文件名为空 按照默认规则定位 if ('' == $template) {
$template = CONTROLLER_NAME . $depr . ACTION_NAME; // 如果模板文件名为空 按照默认规则定位
} elseif (false === strpos($template, $depr)) { $template = CONTROLLER_NAME . $depr . ACTION_NAME;
$template = CONTROLLER_NAME . $depr . $template; } elseif (false === strpos($template, $depr)) {
$template = CONTROLLER_NAME . $depr . $template;
}
} }
return THEME_PATH . $template . $this->config['view_suffix']; return THEME_PATH . $template . $this->config['view_suffix'];
} }
@@ -270,7 +272,7 @@ class View
* @param string $module 模块名 * @param string $module 模块名
* @return string * @return string
*/ */
protected function getThemePath($module = MODULE_NAME) protected function getThemePath($module)
{ {
// 获取当前主题名称 // 获取当前主题名称
$theme = $this->getTemplateTheme($module); $theme = $this->getTemplateTheme($module);