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

改进默认模板引擎的设置 如果没有设置 template.type 或者为空 默认为think

Browse Source
This commit is contained in:
thinkphp
2016-03-16 23:36:04 +08:00
parent 81177066f1
commit eed93e4d52
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/View.php
View File

@@ -40,14 +40,15 @@ class View
// 视图驱动命名空间 // 视图驱动命名空间
'namespace' => '\\think\\view\\driver\\', 'namespace' => '\\think\\view\\driver\\',
// 模板引擎配置参数 // 模板引擎配置参数
'template' => [ 'template' => [],
'type' => 'think',
],
]; ];
public function __construct(array $config = []) public function __construct(array $config = [])
{ {
$this->config($config); $this->config($config);
if (!isset($this->config['template']['type'])) {
$this->config['template']['type'] = 'think';
}
} }
/** /**
@@ -122,6 +123,7 @@ class View
if (empty($this->config['view_path']) && defined('VIEW_PATH')) { if (empty($this->config['view_path']) && defined('VIEW_PATH')) {
$this->config['view_path'] = VIEW_PATH; $this->config['view_path'] = VIEW_PATH;
} }
$config = array_merge($config, [ $config = array_merge($config, [
'view_path' => $this->config['view_path'], 'view_path' => $this->config['view_path'],
'view_suffix' => $this->config['view_suffix'], 'view_suffix' => $this->config['view_suffix'],