mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 23:02:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/top-think/think

Browse Source
This commit is contained in:
thinkphp
2016-03-18 08:36:19 +08:00
parent a6c1de5f89 01a3c5aee5
commit 8dfc12e4a0
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Template.php
View File

@@ -169,6 +169,14 @@ class Template
if ($config) { if ($config) {
$this->config($config); $this->config($config);
} }
if (!empty($this->config['cache_id']) && $this->config['display_cache']) {
// 读取渲染缓存
$cacheContent = Cache::get($this->config['cache_id']);
if ($cacheContent !== false) {
echo $cacheContent;
return;
}
}
$template = $this->parseTemplateFile($template); $template = $this->parseTemplateFile($template);
if ($template) { if ($template) {
$cacheFile = $this->config['cache_path'] . $this->config['cache_prefix'] . md5($template) . $this->config['cache_suffix']; $cacheFile = $this->config['cache_path'] . $this->config['cache_prefix'] . md5($template) . $this->config['cache_suffix'];

14
tests/thinkphp/library/think/templateTest.php
View File

@@ -319,8 +319,10 @@ EOF;
$template = new Template(); $template = new Template();
$template->assign('name', 'name'); $template->assign('name', 'name');
$config = [ $config = [
'strip_space' => true, 'strip_space' => true,
'view_path' => dirname(__FILE__) . '/', 'view_path' => dirname(__FILE__) . '/',
'cache_id' => '__CACHE_ID__',
'display_cache'=> true
]; ];
$data = ['name' => 'value']; $data = ['name' => 'value'];
$template->layout('layout')->display('display', $data, $config); $template->layout('layout')->display('display', $data, $config);
@@ -401,4 +403,12 @@ EOF;
$template->assign($data); $template->assign($data);
$this->assertEquals($data, $template->get()); $this->assertEquals($data, $template->get());
} }
public function testIsCache()
{
$template = new Template(['cache_id' => '__CACHE_ID__','display_cache' => true]);
$this->assertTrue(!$template->isCache('__CACHE_ID__'));
$template->display_cache = false;
$this->assertTrue(!$template->isCache('__CACHE_ID__'));
}
} }