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

修正 模板引擎驱动类的config方法

Browse Source
This commit is contained in:
thinkphp
2016-09-18 11:39:37 +08:00
parent 2aa3adb2a8
commit f75d1c5d80
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,11 @@ class Php
*/ */
public function config($name, $value = null) public function config($name, $value = null)
{ {
if (is_array($name)) {
$this->config = array_merge($this->config, $name);
} else {
$this->config[$name] = $value;
}
} }
} }

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

@@ -140,8 +140,10 @@ class Think
{ {
if (is_array($name)) { if (is_array($name)) {
$this->template->config($name); $this->template->config($name);
$this->config = array_merge($this->config, $name);
} else { } else {
$this->template->$name = $value; $this->template->$name = $value;
$this->config[$name] = $value;
} }
} }