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
@@ -1,7 +1,7 @@
<?php
/**
* Smarty Method UnloadFilter
* Smarty Method MustCompile
*
* Smarty_Internal_Template::mustCompile() method
*
@@ -31,7 +31,7 @@ class Smarty_Internal_Method_MustCompile
public function mustCompile(Smarty_Internal_Template $_template)
{
if (!$_template->source->exists) {
if (isset($_template->parent) && $_template->parent->_objType == 2) {
if ($_template->_isSubTpl()) {
$parent_resource = " in '$_template->parent->template_resource}'";
} else {
$parent_resource = '';
@@ -40,8 +40,10 @@ class Smarty_Internal_Method_MustCompile
}
if ($_template->mustCompile === null) {
$_template->mustCompile = (!$_template->source->handler->uncompiled &&
($_template->smarty->force_compile || $_template->source->handler->recompiled || !$_template->compiled->exists ||
($_template->smarty->compile_check && $_template->compiled->getTimeStamp() < $_template->source->getTimeStamp())));
($_template->smarty->force_compile || $_template->source->handler->recompiled ||
!$_template->compiled->exists || ($_template->smarty->compile_check &&
$_template->compiled->getTimeStamp() <
$_template->source->getTimeStamp())));
}
return $_template->mustCompile;