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); } /**