From a5b242b2c2729600cfe21cb9a391e40963d6df71 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 24 Apr 2016 14:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E6=96=B9=E6=B3=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Template.php          | 4 ++--
 library/think/view/driver/Think.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/think/Template.php b/library/think/Template.php
index b9f3f32c..618fddb0 100644
--- a/library/think/Template.php
+++ b/library/think/Template.php
@@ -161,7 +161,7 @@ class Template
      * @param array $config 模板参数
      * @return void
      */
-    public function display($template, $vars = [], $config = [])
+    public function fetch($template, $vars = [], $config = [])
     {
         if ($vars) {
             $this->data = $vars;
@@ -208,7 +208,7 @@ class Template
      * @param array $config 模板参数
      * @return void
      */
-    public function fetch($content, $vars = [], $config = [])
+    public function display($content, $vars = [], $config = [])
     {
         if ($vars) {
             $this->data = $vars;
diff --git a/library/think/view/driver/Think.php b/library/think/view/driver/Think.php
index 3466329c..f06406c8 100644
--- a/library/think/view/driver/Think.php
+++ b/library/think/view/driver/Think.php
@@ -57,7 +57,7 @@ class Think
         }
         // 记录视图信息
         APP_DEBUG && Log::record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]', 'info');
-        $this->template->display($template, $data, $config);
+        $this->template->fetch($template, $data, $config);
     }
 
     /**
@@ -70,7 +70,7 @@ class Think
      */
     public function display($template, $data = [], $config = [])
     {
-        $this->template->fetch($template, $data, $config);
+        $this->template->display($template, $data, $config);
     }
 
     /**