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

更新核心

Browse Source
This commit is contained in:
thinkphp
2015-03-27 15:38:46 +08:00
parent 9df7ecab9a
commit 7bb958636e
10 changed files with 100 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/template.php
View File

@@ -50,10 +50,8 @@ class Template {
* 架构函数
* @access public
*/
public function __construct($config=[]){
if(!empty($config)) {
$this->config = array_merge($this->config,$config);
}
public function __construct(array $config=[]){
$this->config = array_merge($this->config, empty($config) ? (array)Config::get('template') : $config );
$this->config['taglib_begin'] = $this->stripPreg($this->config['taglib_begin']);
$this->config['taglib_end'] = $this->stripPreg($this->config['taglib_end']);
$this->config['tpl_begin'] = $this->stripPreg($this->config['tpl_begin']);