diff --git a/change_log.txt b/change_log.txt index f2f77d95..cc1c32d3 100644 --- a/change_log.txt +++ b/change_log.txt @@ -2,6 +2,7 @@ 19.12.2015 - bugfix using $smarty.capture.foo in expressions could fail https://github.com/smarty-php/smarty/pull/138 - bugfix broken PHP 5.2 compatibility + - remove no longer used code 18.12.2015 - bugfix regression when modifier parameter was follow by math https://github.com/smarty-php/smarty/issues/132 diff --git a/libs/sysplugins/smarty_internal_runtime_updatecache.php b/libs/sysplugins/smarty_internal_runtime_updatecache.php index 73de954f..a895a307 100644 --- a/libs/sysplugins/smarty_internal_runtime_updatecache.php +++ b/libs/sysplugins/smarty_internal_runtime_updatecache.php @@ -73,7 +73,7 @@ class Smarty_Internal_Runtime_UpdateCache /** * Cache was invalid , so render from compiled and write to cache - * + * * @param \Smarty_Template_Cached $cached * @param \Smarty_Internal_Template $_template * @param $no_output_filter @@ -129,20 +129,6 @@ class Smarty_Internal_Runtime_UpdateCache return false; } $content = $_template->smarty->ext->_codeFrame->create($_template, $content, '', true); - if (!empty($_template->cached->tpl_function)) { - foreach ($_template->cached->tpl_function as $funcParam) { - if (is_file($funcParam['compiled_filepath'])) { - // read compiled file - $code = file_get_contents($funcParam['compiled_filepath']); - // grab template function - if (preg_match("/\/\* {$funcParam['call_name']} \*\/([\S\s]*?)\/\*\/ {$funcParam['call_name']} \*\//", - $code, $match)) { - unset($code); - $content .= "\n"; - } - } - } - } return $this->write($cached, $_template, $content); } diff --git a/libs/sysplugins/smarty_template_resource_base.php b/libs/sysplugins/smarty_template_resource_base.php index b9e2e283..0911feb8 100644 --- a/libs/sysplugins/smarty_template_resource_base.php +++ b/libs/sysplugins/smarty_template_resource_base.php @@ -79,13 +79,6 @@ abstract class Smarty_Template_Resource_Base */ public $required_plugins = array(); - /** - * Known template functions - * - * @var array - */ - public $tpl_function = array(); - /** * Included subtemplates *