mirror/fenom
1
0
Fork 0
mirror of https://github.com/fenom-template/fenom.git synced 2023-08-10 21:13:07 +03:00
Code Issues Projects Releases Wiki Activity

fix FORCE_COMPILE should have priority and ignore storage

Browse Source
This commit is contained in:
klkvsk 2013-07-10 13:46:25 +04:00
parent 7a39a854d7
commit 950175ce73
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Fenom.php
View File

@ -613,8 +613,13 @@ class Fenom {
*/
public function getTemplate($template, $options = 0) {
$options |= $this->_options;
$key = dechex($options)."@".$template;
if(isset($this->_storage[ $key ])) {
if (($options & self::FORCE_COMPILE) === self::FORCE_COMPILE) {
return $this->compile($template, ($options & self::DISABLE_CACHE) === self::DISABLE_CACHE, $options);
}
$key = dechex($options)."@".$template;
if(isset($this->_storage[ $key ])) {
/** @var Fenom\Template $tpl */
$tpl = $this->_storage[ $key ];
if(($options & self::AUTO_RELOAD) && !$tpl->isValid()) {
@ -622,8 +627,6 @@ class Fenom {
} else {
return $tpl;
}
} elseif($options & self::FORCE_COMPILE === self::FORCE_COMPILE) {
return $this->compile($template, $options & self::DISABLE_CACHE === self::DISABLE_CACHE, $options);
} else {
return $this->_storage[ $key ] = $this->_load($template, $options);
}
@ -653,7 +656,7 @@ class Fenom {
$fenom = $this;
/** @var Fenom\Render $cached */
$cached = include($cachePath);
if (($opts & self::AUTO_RELOAD !== self::AUTO_RELOAD) || $cached->isValid()) {
if (($opts & self::AUTO_RELOAD) !== self::AUTO_RELOAD || $cached->isValid()) {
$useCache = true;
}
}