smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-05 02:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

- bugfix disable of caching after isCached() call did not work (Forum Topic 20131)

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2011-10-13 11:59:02 +00:00
parent 3b006ae5a1
commit 806c51fdcf
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
change_log.txt
View File

@@ -1,6 +1,7 @@
===== trunk ===== ===== trunk =====
13.10.2011 13.10.2011
- add caching for config files in Smarty_Resource - add caching for config files in Smarty_Resource
- bugfix disable of caching after isCached() call did not work (Forum Topic 20131)
11.10.2011 11.10.2011
- add runtime checks for not matching {capture}/{/capture} calls (Forum Topic 20120) - add runtime checks for not matching {capture}/{/capture} calls (Forum Topic 20120)

4
libs/sysplugins/smarty_internal_templatebase.php
View File

@@ -45,6 +45,10 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
$_template = ($template instanceof $this->template_class) $_template = ($template instanceof $this->template_class)
? $template ? $template
: $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false); : $this->smarty->createTemplate($template, $cache_id, $compile_id, $parent, false);
// if called by Smarty object make sure we use current caching status
if ($this instanceof Smarty) {
$_template->caching = $this->caching;
}
// merge all variable scopes into template // merge all variable scopes into template
if ($merge_tpl_vars) { if ($merge_tpl_vars) {
// save local variables // save local variables