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

优化2处写法

Browse Source
This commit is contained in:
huangdijia
2016-03-16 13:35:56 +08:00
parent 8a47be77b5
commit 45ca16e8b7
1 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
library/think/Template.php
View File

@@ -221,15 +221,18 @@ class Template
*/ */
public function layout($name) public function layout($name)
{ {
if (false !== $name) { if (false === $name) {
$this->config['layout_on'] = true;
if (is_string($name)) {
$this->config['layout_name'] = $name;
}
} else {
// 关闭布局 // 关闭布局
$this->config['layout_on'] = false; $this->config['layout_on'] = false;
return $this;
} }
// 开启布局
$this->config['layout_on'] = true;
// 名称必须为字符串
if (is_string($name)) {
$this->config['layout_name'] = $name;
}
return $this;
} }
/** /**
@@ -241,25 +244,36 @@ class Template
*/ */
private function checkCache($cacheFile) private function checkCache($cacheFile)
{ {
if ($this->config['tpl_cache'] && is_file($cacheFile) && $handle = @fopen($cacheFile, "r")) { // 未开启缓存功能
// 读取第一行 if (!$this->config['tpl_cache']) {
preg_match('/\/\*(.+?)\*\//', fgets($handle), $matches); return false;
if (isset($matches[1])) { }
$includeFile = unserialize($matches[1]); // 缓存文件不存在
if (is_array($includeFile)) { if (!is_file($cacheFile)) {
// 检查模板文件是否有更新 return false;
foreach ($includeFile as $path => $time) { }
if (is_file($path) && filemtime($path) > $time) { // 读取缓存文件失败
// 模板文件如果有更新则缓存需要更新 if (!$handle = @fopen($cacheFile, "r")) {
return false; return false;
} }
} // 读取第一行
} preg_match('/\/\*(.+?)\*\//', fgets($handle), $matches);
// 检查编译存储是否有效 if (!isset($matches[1])) {
return $this->storage->check($cacheFile, $this->config['cache_time']); return false;
}
$includeFile = unserialize($matches[1]);
if (!is_array($includeFile)) {
return false;
}
// 检查模板文件是否有更新
foreach ($includeFile as $path => $time) {
if (is_file($path) && filemtime($path) > $time) {
// 模板文件如果有更新则缓存需要更新
return false;
} }
} }
return false; // 检查编译存储是否有效
return $this->storage->check($cacheFile, $this->config['cache_time']);
} }
/** /**