From 75cfc95b38df4af413526fd2f7bf7ea59ae3fa19 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 12 Jun 2016 11:36:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Controller=E7=B1=BB=E7=9A=84d?=
 =?UTF-8?q?isplay=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Controller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/think/Controller.php b/library/think/Controller.php
index a9dcd6cb..503f1884 100644
--- a/library/think/Controller.php
+++ b/library/think/Controller.php
@@ -111,12 +111,13 @@ class Controller
      * @access protected
      * @param string $content 模板内容
      * @param array  $vars     模板输出变量
+     * @param array  $replace 替换内容
      * @param array $config     模板参数
      * @return mixed
      */
-    protected function display($content = '', $vars = [], $config = [])
+    protected function display($content = '', $vars = [], $replace = [], $config = [])
     {
-        return $this->view->display($content, $vars, $config);
+        return $this->view->display($content, $vars, $replace, $config);
     }
 
     /**