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

View类优化

Browse Source
This commit is contained in:
thinkphp
2016-03-14 14:02:37 +08:00
parent 2a9fb524a8
commit 06ba891ca4
3 changed files with 18 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
library/think/View.php
View File

@@ -242,15 +242,12 @@ class View
}
$depr = $this->config['view_depr'];
$template = str_replace(['/', ':'], $depr, $template);
// 获取当前模块
$module = defined('MODULE_NAME') ? MODULE_NAME : '';
$theme = $this->getTemplateTheme();
$path = $this->config['view_path'];
if (strpos($template, '@')) {
// 跨模块调用模版文件
list($module, $template) = explode('@', $template);
$path = APP_PATH . (APP_MULTI_MODULE ? $module . DS : '') . $this->config['view_layer'] . DS;
}
// 获取当前主题的模版路径
$path = $this->getThemePath($module);
// 分析模板文件规则
if (defined('CONTROLLER_NAME')) {
@@ -261,16 +258,15 @@ class View
$template = str_replace('.', DS, CONTROLLER_NAME) . $depr . $template;
}
}
return $path . $template . $this->config['view_suffix'];
return realpath($path) . DS . $theme . $template . $this->config['view_suffix'];
}
/**
* 获取当前的模板主题
* @access private
* @param string $module 模块名
* @return string
*/
private function getTemplateTheme($module)
private function getTemplateTheme()
{
if ($this->config['theme_on']) {
if ($this->theme) {
@@ -284,7 +280,7 @@ class View
} elseif (Cookie::get('think_theme')) {
$theme = Cookie::get('think_theme');
}
if (!isset($theme) || !is_dir(APP_PATH . (APP_MULTI_MODULE ? $module . DS : '') . $this->config['view_layer'] . DS . $theme)) {
if (!isset($theme) || !is_dir($this->config['view_path'] . DS . $theme)) {
$theme = $this->config['default_theme'];
}
Cookie::set('think_theme', $theme, 864000);
@@ -296,25 +292,6 @@ class View
return '';
}
/**
* 获取当前的模板路径
* @access protected
* @param string $module 模块名
* @return string
*/
protected function getThemePath($module = '')
{
// 获取当前主题名称
$theme = $this->getTemplateTheme($module);
// 获取当前主题的模版路径
$tmplPath = $this->config['view_path']; // 模块设置独立的视图目录
if (!$tmplPath) {
// 定义TMPL_PATH 则改变全局的视图目录到模块之外
$tmplPath = defined('TMPL_PATH') ? TMPL_PATH . $module . DS : APP_PATH . (APP_MULTI_MODULE ? $module . DS : '') . $this->config['view_layer'] . DS;
}
return realpath($tmplPath) . DS . $theme;
}
/**
* 模板变量赋值
* @access public