改进模板变量多次渲染混淆的问题

top-think · Sep 4, 2019 · 1db0078 · 1db0078
1 parent 3fb2741
commit 1db0078
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/Template.php b/src/Template.php
@@ -120,8 +120,7 @@ public function __construct(array $config = [])
     /**
      * 模板变量赋值
      * @access public
-     * @param  mixed $name
-     * @param  mixed $value
+     * @param  array $vars 模板变量
      * @return $this
      */
     public function assign(array $vars = [])
@@ -222,9 +221,8 @@ public function extend(string $rule, callable $callback = null): void
      */
     public function fetch(string $template, array $vars = []): void
     {
-        if ($vars) {
-            $this->data = array_merge($this->data, $vars);
-        }
+
+        $data = $vars ? array_merge($this->data, $vars) : $this->data;
 
         if (!empty($this->config['cache_id']) && $this->config['display_cache'] && $this->cache) {
             // 读取渲染缓存
@@ -250,7 +248,7 @@ public function fetch(string $template, array $vars = []): void
             ob_implicit_flush(0);
 
             // 读取编译存储
-            $this->storage->read($cacheFile, $this->data);
+            $this->storage->read($cacheFile, $data);
 
             // 获取并清空缓存
             $content = ob_get_clean();
@@ -289,9 +287,7 @@ public function isCache(string $cacheId): bool
      */
     public function display(string $content, array $vars = []): void
     {
-        if ($vars) {
-            $this->data = array_merge($this->data, $vars);
-        }
+        $data = $vars ? array_merge($this->data, $vars) : $this->data;
 
         $cacheFile = $this->config['cache_path'] . $this->config['cache_prefix'] . md5($content) . '.' . ltrim($this->config['cache_suffix'], '.');
 
@@ -301,7 +297,7 @@ public function display(string $content, array $vars = []): void
         }
 
         // 读取编译存储
-        $this->storage->read($cacheFile, $this->data);
+        $this->storage->read($cacheFile, $data);
     }
 
     /**