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 Fenom::_options not being merged in getTemplate(), but being merged in compile(), therefore_load() was looking up wrong filename when _options != 0

Browse Source
This commit is contained in:
klkvsk 2013-07-09 15:10:12 +04:00
parent 6c6bd27797
commit 5c2685f1eb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Fenom.php
View File

@ -612,17 +612,18 @@ class Fenom {
* @return Fenom\Template
*/
public function getTemplate($template, $options = 0) {
$key = dechex($this->_options | $options)."@".$template;
$options |= $this->_options;
$key = dechex($options)."@".$template;
if(isset($this->_storage[ $key ])) {
/** @var Fenom\Template $tpl */
$tpl = $this->_storage[ $key ];
if(($this->_options & self::AUTO_RELOAD) && !$tpl->isValid()) {
if(($options & self::AUTO_RELOAD) && !$tpl->isValid()) {
return $this->_storage[ $key ] = $this->compile($template, true, $options);
} else {
return $tpl;
}
} elseif($this->_options & self::FORCE_COMPILE === self::FORCE_COMPILE) {
return $this->compile($template, $this->_options & self::DISABLE_CACHE === self::DISABLE_CACHE, $options);
} 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);
}