更新内核

2016-09-18 22:48:00 +08:00
parent 8536017505
commit e818c386e2
10 changed files with 29 additions and 68 deletions
--- a/core/library/think/view/driver/Think.php
+++ b/core/library/think/view/driver/Think.php
@@ -140,8 +140,10 @@ class Think
    {
        if (is_array($name)) {
            $this->template->config($name);
+            $this->config = array_merge($this->config, $name);
        } else {
            $this->template->$name = $value;
+            $this->config[$name]   = $value;
        }
    }