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

改进模板解析规则

Browse Source
This commit is contained in:
thinkphp
2016-05-28 11:20:45 +08:00
parent 12f06f2467
commit 99d29eb48f
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/think/view/driver/Php.php
View File

@@ -39,7 +39,7 @@ class Php
*/
public function exists($template)
{
if (!is_file($template)) {
if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
// 获取模板文件名
$template = $this->parseTemplate($template);
}
@@ -55,7 +55,7 @@ class Php
*/
public function fetch($template, $data = [])
{
if (!is_file($template)) {
if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
// 获取模板文件名
$template = $this->parseTemplate($template);
}
@@ -94,17 +94,17 @@ class Php
$this->config['view_path'] = VIEW_PATH;
}
$depr = $this->config['view_depr'];
$template = str_replace(['/', ':'], $depr, $template);
if (strpos($template, '@')) {
list($module, $template) = explode('@', $template);
$path = APP_PATH . (APP_MULTI_MODULE ? $module . DS : '') . VIEW_LAYER . DS;
$path = APP_PATH . $module . DS . VIEW_LAYER . DS;
} else {
$path = $this->config['view_path'];
}
// 分析模板文件规则
if (defined('CONTROLLER_NAME')) {
if (defined('CONTROLLER_NAME') && 0 !== strpos($template, '/')) {
$depr = $this->config['view_depr'];
$template = str_replace(['/', ':'], $depr, $template);
if ('' == $template) {
// 如果模板文件名为空 按照默认规则定位
$template = str_replace('.', DS, CONTROLLER_NAME) . $depr . ACTION_NAME;
@@ -112,7 +112,8 @@ class Php
$template = str_replace('.', DS, CONTROLLER_NAME) . $depr . $template;
}
}
return $path . $template . '.' . ltrim($this->config['view_suffix'], '.');
return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
}
}

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

@@ -48,7 +48,7 @@ class Think
*/
public function exists($template)
{
if (!is_file($template)) {
if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
// 获取模板文件名
$template = $this->parseTemplate($template);
}
@@ -65,7 +65,7 @@ class Think
*/
public function fetch($template, $data = [], $config = [])
{
if (!is_file($template)) {
if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
// 获取模板文件名
$template = $this->parseTemplate($template);
}
@@ -99,17 +99,20 @@ class Think
*/
private function parseTemplate($template)
{
$depr = $this->config['view_depr'];
$template = str_replace(['/', ':'], $depr, $template);
// 获取视图根目录
if (strpos($template, '@')) {
// 跨模块调用
list($module, $template) = explode('@', $template);
$path = APP_PATH . (APP_MULTI_MODULE ? $module . DS : '') . VIEW_LAYER . DS;
$path = APP_PATH . $module . DS . VIEW_LAYER . DS;
} else {
// 当前视图目录
$path = $this->config['view_path'];
}
// 分析模板文件规则
if (defined('CONTROLLER_NAME')) {
if (defined('CONTROLLER_NAME') && 0 !== strpos($template, '/')) {
$depr = $this->config['view_depr'];
$template = str_replace(['/', ':'], $depr, $template);
if ('' == $template) {
// 如果模板文件名为空 按照默认规则定位
$template = str_replace('.', DS, CONTROLLER_NAME) . $depr . ACTION_NAME;
@@ -117,7 +120,7 @@ class Think
$template = str_replace('.', DS, CONTROLLER_NAME) . $depr . $template;
}
}
return $path . $template . '.' . ltrim($this->config['view_suffix'], '.');
return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
}
public function __call($method, $params)