From 5bcc13a2734257fe5122b72017f2ec5e49465a8c Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 6 May 2016 21:45:13 +0800
Subject: [PATCH] =?UTF-8?q?Template=E7=B1=BB=E6=94=B9=E8=BF=9Blayout?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Template.php          | 6 +++++-
 library/think/view/driver/Think.php | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/think/Template.php b/library/think/Template.php
index 618fddb0..3124e755 100644
--- a/library/think/Template.php
+++ b/library/think/Template.php
@@ -229,9 +229,10 @@ class Template
      * 设置布局
      * @access public
      * @param mixed $name 布局模板名称 false 则关闭布局
+     * @param string $replace 布局模板内容替换标识
      * @return object
      */
-    public function layout($name)
+    public function layout($name, $replace = '')
     {
         if (false === $name) {
             // 关闭布局
@@ -243,6 +244,9 @@ class Template
             if (is_string($name)) {
                 $this->config['layout_name'] = $name;
             }
+            if (!empty($replace)) {
+                $this->config['layout_item'] = $replace;
+            }
         }
         return $this;
     }
diff --git a/library/think/view/driver/Think.php b/library/think/view/driver/Think.php
index f06406c8..802eba61 100644
--- a/library/think/view/driver/Think.php
+++ b/library/think/view/driver/Think.php
@@ -26,6 +26,8 @@ class Think
         'view_suffix' => '.html',
         // 模板文件名分隔符
         'view_depr'   => DS,
+        // 是否开启模板编译缓存,设为false则每次都会重新编译
+        'tpl_cache'   => true,
     ];
 
     public function __construct($config = [])