Update Smarty to 3.1.3

This commit is contained in:
Rob Lensen
2018-01-18 00:23:24 +01:00
parent 6a3f8f3e76
commit db684f6151
190 changed files with 7430 additions and 5215 deletions
@@ -72,6 +72,13 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
*/
public $hashes = array();
/**
* Flag if this is a cache resource
*
* @var bool
*/
public $isCache = true;
/**
* create Cached Object container
*
@@ -99,7 +106,7 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
$_template->cached->handler->populate($_template->cached, $_template);
// caching enabled ?
if (!($_template->caching == Smarty::CACHING_LIFETIME_CURRENT ||
$_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->handler->recompiled
$_template->caching == Smarty::CACHING_LIFETIME_SAVED) || $_template->source->handler->recompiled
) {
$_template->cached->valid = false;
}
@@ -118,6 +125,9 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
{
if ($this->isCached($_template)) {
if ($_template->smarty->debugging) {
if (!isset($_template->smarty->_debug)) {
$_template->smarty->_debug = new Smarty_Internal_Debug();
}
$_template->smarty->_debug->start_cache($_template);
}
if (!$this->processed) {
@@ -234,7 +244,7 @@ class Smarty_Template_Cached extends Smarty_Template_Resource_Base
*
* @param Smarty_Internal_Template $_template template object
*
* @return string content
* @return string|false content
*/
public function read(Smarty_Internal_Template $_template)
{