From bdf9f41da85f6fbe4dffb9f510ddd65454540a97 Mon Sep 17 00:00:00 2001 From: uwetews Date: Fri, 1 Jan 2016 18:28:27 +0100 Subject: [PATCH] - remove Smarty::$resource_cache_mode property --- change_log.txt | 3 ++ libs/Smarty.class.php | 16 +++----- libs/sysplugins/smarty_template_compiled.php | 19 --------- libs/sysplugins/smarty_template_config.php | 1 - libs/sysplugins/smarty_template_source.php | 42 -------------------- 5 files changed, 8 insertions(+), 73 deletions(-) diff --git a/change_log.txt b/change_log.txt index 22d7231c..aea68376 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,7 @@  ===== 3.1.30-dev ===== (xx.xx.xx) + 01.01.2016 + - remove Smarty::$resource_cache_mode property + 31.12.2015 - optimization of {assign}, {if} and {while} compiled code diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php index 437afe14..4dfd8794 100644 --- a/libs/Smarty.class.php +++ b/libs/Smarty.class.php @@ -121,7 +121,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '3.1.30-dev/14'; + const SMARTY_VERSION = '3.1.30-dev/15'; /** * define variable scopes @@ -209,6 +209,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Resource caching modes + * (not used since 3.1.30) */ const RESOURCE_CACHE_OFF = 0; @@ -565,13 +566,6 @@ class Smarty extends Smarty_Internal_TemplateBase */ public $default_config_type = 'file'; - /** - * enable resource caching - * - * @var bool - */ - public $resource_cache_mode = 1; - /** * check If-Modified-Since headers * @@ -682,9 +676,9 @@ class Smarty extends Smarty_Internal_TemplateBase * * @var string[] */ - private $obsoleteProperties = array('resource_caching', 'template_resource_caching', - 'direct_access_security', '_dir_perms', '_file_perms', - 'plugin_search_order', 'inheritance_merge_compiled_includes'); + private $obsoleteProperties = array('resource_caching', 'template_resource_caching', 'direct_access_security', + '_dir_perms', '_file_perms', 'plugin_search_order', + 'inheritance_merge_compiled_includes', 'resource_cache_mode',); /** * List of private properties which will call getter/setter on a direct access diff --git a/libs/sysplugins/smarty_template_compiled.php b/libs/sysplugins/smarty_template_compiled.php index 606335fc..9a5801e0 100644 --- a/libs/sysplugins/smarty_template_compiled.php +++ b/libs/sysplugins/smarty_template_compiled.php @@ -28,31 +28,12 @@ class Smarty_Template_Compiled extends Smarty_Template_Resource_Base */ static function load($_template) { - // check runtime cache - if (!$_template->source->handler->recompiled && - ($_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) - ) { - $_cache_key = $_template->source->unique_resource . '#'; - if ($_template->caching) { - $_cache_key .= 'caching#'; - } - $_cache_key .= $_template->compile_id; - if (isset($_template->source->compileds[$_cache_key])) { - return $_template->source->compileds[$_cache_key]; - } - } $compiled = new Smarty_Template_Compiled(); if ($_template->source->handler->hasCompiledHandler) { $_template->source->handler->populateCompiledFilepath($compiled, $_template); } else { $compiled->populateCompiledFilepath($_template); } - // runtime cache - if (!$_template->source->handler->recompiled && - ($_template->smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) - ) { - $_template->source->compileds[$_cache_key] = $compiled; - } return $compiled; } diff --git a/libs/sysplugins/smarty_template_config.php b/libs/sysplugins/smarty_template_config.php index f0fff508..22d45981 100644 --- a/libs/sysplugins/smarty_template_config.php +++ b/libs/sysplugins/smarty_template_config.php @@ -91,7 +91,6 @@ class Smarty_Template_Config extends Smarty_Template_Source if (!$source->exists && isset($_template->smarty->default_config_handler_func)) { Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source); } - $source->unique_resource = $resource->buildUniqueResourceName($_template->smarty, $name, true); return $source; } } diff --git a/libs/sysplugins/smarty_template_source.php b/libs/sysplugins/smarty_template_source.php index be5b6280..b5b50c37 100644 --- a/libs/sysplugins/smarty_template_source.php +++ b/libs/sysplugins/smarty_template_source.php @@ -39,13 +39,6 @@ class Smarty_Template_Source */ public $name = null; - /** - * Unique Resource Name - * - * @var string - */ - public $unique_resource = null; - /** * Source Filepath * @@ -102,13 +95,6 @@ class Smarty_Template_Source */ public $isConfig = false; - /** - * cache for Smarty_Template_Compiled instances - * - * @var Smarty_Template_Compiled[] - */ - public $compileds = array(); - /** * Template source content eventually set by default handler * @@ -170,40 +156,12 @@ class Smarty_Template_Source $handler = isset($smarty->_cache['resource_handlers'][$type]) ? $smarty->_cache['resource_handlers'][$type] : Smarty_Resource::load($smarty, $type); - // if resource is not recompiling and resource name is not dotted we can check the source cache - if (($smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) && !$handler->recompiled && - !(isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/')) - ) { - $unique_resource = $handler->buildUniqueResourceName($smarty, $name); - if (isset($smarty->_cache['source_objects'][$unique_resource])) { - return $smarty->_cache['source_objects'][$unique_resource]; - } - } else { - $unique_resource = null; - } // create new source object $source = new Smarty_Template_Source($handler, $smarty, $template_resource, $type, $name); $handler->populate($source, $_template); if (!$source->exists && isset($_template->smarty->default_template_handler_func)) { Smarty_Internal_Method_RegisterDefaultTemplateHandler::_getDefaultTemplate($source); } - // on recompiling resources we are done - if (($smarty->resource_cache_mode & Smarty::RESOURCE_CACHE_ON) && !$handler->recompiled) { - // may by we have already $unique_resource - $is_relative = false; - if (!isset($unique_resource)) { - $is_relative = isset($name[1]) && $name[0] == '.' && ($name[1] == '.' || $name[1] == '/') && - ($type == 'file' || - (isset($_template->parent->source) && $_template->parent->source->type == 'extends')); - $unique_resource = - $handler->buildUniqueResourceName($smarty, $is_relative ? $source->filepath . $name : $name); - } - $source->unique_resource = $unique_resource; - // save in runtime cache if not relative - if (!$is_relative) { - $smarty->_cache['source_objects'][$unique_resource] = $source; - } - } return $source; }