Public/IP
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update Smarty und RedBean

Browse source 
Smarty: 3.1.30 - Redbean: 5.0.0
This commit is contained in:
Robin Kloppe 2018-01-28 19:29:49 +01:00
parent eb0835ff74
commit 0795a87ecd
193 changed files with 22035 additions and 14455 deletions
Download patch file Download diff file Expand all files Collapse all files

50
libs/sysplugins/smarty_internal_resource_extends.php
View file

@ -39,25 +39,24 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
$components = explode('|', $source->name);
$exists = true;
foreach ($components as $component) {
$s = Smarty_Resource::source(null, $source->smarty, $component);
if ($s->type == 'php') {
throw new SmartyException("Resource type {$s->type} cannot be used with the extends resource type");
/* @var \Smarty_Template_Source $_s */
$_s = Smarty_Template_Source::load(null, $source->smarty, $component);
if ($_s->type == 'php') {
throw new SmartyException("Resource type {$_s->type} cannot be used with the extends resource type");
}
$sources[$s->uid] = $s;
$uid .= realpath($s->filepath);
if ($_template && $_template->smarty->compile_check) {
$exists = $exists && $s->exists;
$sources[ $_s->uid ] = $_s;
$uid .= $_s->filepath;
if ($_template) {
$exists = $exists && $_s->exists;
}
}
$source->components = $sources;
$source->filepath = $s->filepath;
$source->uid = sha1($uid);
if ($_template && $_template->smarty->compile_check) {
$source->timestamp = $s->timestamp;
$source->exists = $exists;
$source->filepath = $_s->filepath;
$source->uid = sha1($uid . $source->smarty->_joined_template_dir);
$source->exists = $exists;
if ($_template) {
$source->timestamp = $_s->timestamp;
}
// need the template at getContent()
$source->template = $_template;
}
/**
@ -68,10 +67,11 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
public function populateTimestamp(Smarty_Template_Source $source)
{
$source->exists = true;
foreach ($source->components as $s) {
$source->exists = $source->exists && $s->exists;
/* @var \Smarty_Template_Source $_s */
foreach ($source->components as $_s) {
$source->exists = $source->exists && $_s->exists;
}
$source->timestamp = $s->timestamp;
$source->timestamp = $source->exists ? $_s->getTimeStamp() : false;
}
/**
@ -91,9 +91,10 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
$_components = array_reverse($source->components);
$_content = '';
foreach ($_components as $_component) {
/* @var \Smarty_Template_Source $_s */
foreach ($_components as $_s) {
// read content
$_content .= $_component->content;
$_content .= $_s->getContent();
}
return $_content;
}
@ -109,4 +110,15 @@ class Smarty_Internal_Resource_Extends extends Smarty_Resource
{
return str_replace(':', '.', basename($source->filepath));
}
/*
* Disable timestamp checks for extends resource.
* The individual source components will be checked.
*
* @return bool
*/
public function checkTimestamps()
{
return false;
}
}