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

-change run output filter before cache file is written (as in Smarty2)

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2010-11-27 15:05:38 +00:00
parent 2e1c83f44d
commit e80dd75958
4 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
change_log.txt
View File

@@ -1,4 +1,6 @@
===== SVN trunk ===== ===== SVN trunk =====
27/11/2010
-change run output filter before cache file is written. (same as in Smarty2)
24/11/2011 24/11/2011
-bugfix on parser at !$foo|modifier -bugfix on parser at !$foo|modifier

2
libs/Smarty.class.php
View File

@@ -329,7 +329,7 @@ class Smarty extends Smarty_Internal_Data {
} }
} }
// return redered template // return redered template
if (isset($this->autoload_filters['output']) || isset($this->registered_filters['output'])) { if ((!$this->caching || $_template->resource_object->isEvaluated) && (isset($this->autoload_filters['output']) || isset($this->registered_filters['output']))) {
$_output = Smarty_Internal_Filter_Handler::runFilter('output', $_template->getRenderedTemplate(), $_template); $_output = Smarty_Internal_Filter_Handler::runFilter('output', $_template->getRenderedTemplate(), $_template);
} else { } else {
$_output = $_template->getRenderedTemplate(); $_output = $_template->getRenderedTemplate();

2
libs/sysplugins/smarty_internal_debug.php
View File

@@ -103,7 +103,7 @@ class Smarty_Internal_Debug extends Smarty_Internal_Data {
$_template->assign('assigned_vars', $_assigned_vars); $_template->assign('assigned_vars', $_assigned_vars);
$_template->assign('config_vars', $_config_vars); $_template->assign('config_vars', $_config_vars);
$_template->assign('execution_time', microtime(true) - $smarty->start_time); $_template->assign('execution_time', microtime(true) - $smarty->start_time);
echo $smarty->fetch($_template); echo $_template->getRenderedTemplate();
$smarty->left_delimiter = $ldelim; $smarty->left_delimiter = $ldelim;
$smarty->right_delimiter = $rdelim; $smarty->right_delimiter = $rdelim;
} }

3
libs/sysplugins/smarty_internal_template.php
View File

@@ -500,6 +500,9 @@ class Smarty_Internal_Template extends Smarty_Internal_Data {
$output .= preg_replace("!/\*/?%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]); $output .= preg_replace("!/\*/?%%SmartyNocache:{$this->properties['nocache_hash']}%%\*/!", '', $cache_parts[0][$curr_idx]);
} }
} }
if (isset($this->smarty->autoload_filters['output']) || isset($this->smarty->registered_filters['output'])) {
$output = Smarty_Internal_Filter_Handler::runFilter('output', $output, $this);
}
// rendering (must be done before writing cache file because of {function} nocache handling) // rendering (must be done before writing cache file because of {function} nocache handling)
$_smarty_tpl = $this; $_smarty_tpl = $this;
ob_start(); ob_start();