mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-09 16:12:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

统一方法名

Browse Source
This commit is contained in:
thinkphp
2016-04-24 14:34:08 +08:00
parent f40fb831f4
commit a5b242b2c2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Template.php
View File

@@ -161,7 +161,7 @@ class Template
* @param array $config 模板参数 * @param array $config 模板参数
* @return void * @return void
*/ */
public function display($template, $vars = [], $config = []) public function fetch($template, $vars = [], $config = [])
{ {
if ($vars) { if ($vars) {
$this->data = $vars; $this->data = $vars;
@@ -208,7 +208,7 @@ class Template
* @param array $config 模板参数 * @param array $config 模板参数
* @return void * @return void
*/ */
public function fetch($content, $vars = [], $config = []) public function display($content, $vars = [], $config = [])
{ {
if ($vars) { if ($vars) {
$this->data = $vars; $this->data = $vars;

4
library/think/view/driver/Think.php
View File

@@ -57,7 +57,7 @@ class Think
} }
// 记录视图信息 // 记录视图信息
APP_DEBUG && Log::record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]', 'info'); 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 = []) public function display($template, $data = [], $config = [])
{ {
$this->template->fetch($template, $data, $config); $this->template->display($template, $data, $config);
} }
/** /**