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

load source resource at template object creation

Browse Source
This commit is contained in:
Uwe Tews
2015-08-06 19:16:41 +02:00
parent 1ed4808bd9
commit 16fc95ccf7
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/sysplugins/smarty_template_cached.php
View File

@@ -109,9 +109,6 @@ class Smarty_Template_Cached
{ {
$this->compile_id = $_template->compile_id; $this->compile_id = $_template->compile_id;
$this->cache_id = $_template->cache_id; $this->cache_id = $_template->cache_id;
if (!isset($_template->source)) {
$_template->loadSource();
}
$this->source = $_template->source; $this->source = $_template->source;
if (!class_exists('Smarty_CacheResource', false)) { if (!class_exists('Smarty_CacheResource', false)) {
require SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php'; require SMARTY_SYSPLUGINS_DIR . 'smarty_cacheresource.php';
@@ -393,8 +390,7 @@ class Smarty_Template_Cached
$_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $this->timestamp) . ' GMT'; $_SERVER['SMARTY_PHPUNIT_HEADERS'][] = 'Last-Modified: ' . gmdate('D, d M Y H:i:s', $this->timestamp) . ' GMT';
} }
break; break;
default:
default:
header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $this->timestamp) . ' GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s', $this->timestamp) . ' GMT');
break; break;
} }

2
libs/sysplugins/smarty_template_config.php
View File

@@ -109,7 +109,7 @@ class Smarty_Template_Config extends Smarty_Template_Source
$resource = Smarty_Resource::load($smarty, $type); $resource = Smarty_Resource::load($smarty, $type);
$source = new Smarty_Template_Config($resource, $smarty, $template_resource, $type, $name); $source = new Smarty_Template_Config($resource, $smarty, $template_resource, $type, $name);
$resource->populate($source, $_template); $resource->populate($source, $_template);
if ((!isset($source->exists) || !$source->exists) && isset($_template->smarty->default_config_handler_func)) { if (!$source->exists && isset($_template->smarty->default_config_handler_func)) {
Smarty_Internal_Extension_DefaultTemplateHandler::_getDefault($_template, $source); Smarty_Internal_Extension_DefaultTemplateHandler::_getDefault($_template, $source);
} }
$source->unique_resource = $resource->buildUniqueResourceName($smarty, $name, true); $source->unique_resource = $resource->buildUniqueResourceName($smarty, $name, true);