mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-04 10:24:26 +02:00
- bugfix preg_replace could fail on large content resulting in a blank page https://github.com/smarty-php/smarty/issues/417
This commit is contained in:
@@ -1,4 +1,7 @@
|
|||||||
===== 3.1.32 - dev ===
|
===== 3.1.32 - dev ===
|
||||||
|
23.03.2018
|
||||||
|
- bugfix preg_replace could fail on large content resulting in a blank page https://github.com/smarty-php/smarty/issues/417
|
||||||
|
|
||||||
21.03.2018
|
21.03.2018
|
||||||
- bugfix {$smarty.section...} used outside {section}{/section} showed incorrect values if {section}{/section} was called inside
|
- bugfix {$smarty.section...} used outside {section}{/section} showed incorrect values if {section}{/section} was called inside
|
||||||
another loop https://github.com/smarty-php/smarty/issues/422
|
another loop https://github.com/smarty-php/smarty/issues/422
|
||||||
|
@@ -112,7 +112,7 @@ class Smarty extends Smarty_Internal_TemplateBase
|
|||||||
/**
|
/**
|
||||||
* smarty version
|
* smarty version
|
||||||
*/
|
*/
|
||||||
const SMARTY_VERSION = '3.1.32-dev-42';
|
const SMARTY_VERSION = '3.1.32-dev-43';
|
||||||
/**
|
/**
|
||||||
* define variable scopes
|
* define variable scopes
|
||||||
*/
|
*/
|
||||||
|
@@ -94,6 +94,29 @@ class Smarty_Internal_Runtime_CodeFrame
|
|||||||
$output .= $functions;
|
$output .= $functions;
|
||||||
$output .= "<?php }\n";
|
$output .= "<?php }\n";
|
||||||
// remove unneeded PHP tags
|
// remove unneeded PHP tags
|
||||||
return preg_replace(array('/\s*\?>[\n]?<\?php\s*/', '/\?>\s*$/'), array("\n", ''), $output);
|
if (preg_match('/\s*\?>[\n]?<\?php\s*/', $output)) {
|
||||||
|
$curr_split = preg_split('/\s*\?>[\n]?<\?php\s*/',
|
||||||
|
$output);
|
||||||
|
var_dump($curr_split);
|
||||||
|
preg_match_all('/\s*\?>[\n]?<\?php\s*/',
|
||||||
|
$output,
|
||||||
|
$curr_parts);
|
||||||
|
$output = '';
|
||||||
|
foreach ($curr_split as $idx => $curr_output) {
|
||||||
|
$output .= $curr_output;
|
||||||
|
if (isset($curr_parts[ 0 ][ $idx ])) {
|
||||||
|
$output .= "\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (preg_match('/\?>\s*$/', $output)) {
|
||||||
|
$curr_split = preg_split('/\?>\s*$/',
|
||||||
|
$output);
|
||||||
|
$output = '';
|
||||||
|
foreach ($curr_split as $idx => $curr_output) {
|
||||||
|
$output .= $curr_output;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $output;
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -21,56 +21,6 @@ class Smarty_Internal_Runtime_UpdateCache
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sanitize content and write it to cache resource
|
|
||||||
*
|
|
||||||
* @param \Smarty_Template_Cached $cached
|
|
||||||
* @param Smarty_Internal_Template $_template
|
|
||||||
* @param bool $no_output_filter
|
|
||||||
*
|
|
||||||
* @throws \SmartyException
|
|
||||||
*/
|
|
||||||
public function removeNoCacheHash(Smarty_Template_Cached $cached, Smarty_Internal_Template $_template,
|
|
||||||
$no_output_filter)
|
|
||||||
{
|
|
||||||
$content = ob_get_clean();
|
|
||||||
unset($cached->hashes[ $_template->compiled->nocache_hash ]);
|
|
||||||
if (!empty($cached->hashes)) {
|
|
||||||
$hash_array = array();
|
|
||||||
foreach ($cached->hashes as $hash => $foo) {
|
|
||||||
$hash_array[] = "/{$hash}/";
|
|
||||||
}
|
|
||||||
$content = preg_replace($hash_array, $_template->compiled->nocache_hash, $content);
|
|
||||||
}
|
|
||||||
$_template->cached->has_nocache_code = false;
|
|
||||||
// get text between non-cached items
|
|
||||||
$cache_split =
|
|
||||||
preg_split("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
|
|
||||||
$content);
|
|
||||||
// get non-cached items
|
|
||||||
preg_match_all("!/\*%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$_template->compiled->nocache_hash}%%\*/!s",
|
|
||||||
$content, $cache_parts);
|
|
||||||
$content = '';
|
|
||||||
// loop over items, stitch back together
|
|
||||||
foreach ($cache_split as $curr_idx => $curr_split) {
|
|
||||||
// escape PHP tags in template content
|
|
||||||
$content .= preg_replace('/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/',
|
|
||||||
"<?php echo '\$1'; ?>\n", $curr_split);
|
|
||||||
if (isset($cache_parts[ 0 ][ $curr_idx ])) {
|
|
||||||
$_template->cached->has_nocache_code = true;
|
|
||||||
$content .= $cache_parts[ 1 ][ $curr_idx ];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!$no_output_filter && !$_template->cached->has_nocache_code &&
|
|
||||||
(isset($_template->smarty->autoload_filters[ 'output' ]) ||
|
|
||||||
isset($_template->smarty->registered_filters[ 'output' ]))
|
|
||||||
) {
|
|
||||||
$content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
|
|
||||||
}
|
|
||||||
// write cache file content
|
|
||||||
$this->writeCachedContent($cached, $_template, $content);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Cache was invalid , so render from compiled and write to cache
|
* Cache was invalid , so render from compiled and write to cache
|
||||||
*
|
*
|
||||||
@@ -106,6 +56,67 @@ class Smarty_Internal_Runtime_UpdateCache
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sanitize content and write it to cache resource
|
||||||
|
*
|
||||||
|
* @param \Smarty_Template_Cached $cached
|
||||||
|
* @param Smarty_Internal_Template $_template
|
||||||
|
* @param bool $no_output_filter
|
||||||
|
*
|
||||||
|
* @throws \SmartyException
|
||||||
|
*/
|
||||||
|
public function removeNoCacheHash(Smarty_Template_Cached $cached,
|
||||||
|
Smarty_Internal_Template $_template,
|
||||||
|
$no_output_filter)
|
||||||
|
{
|
||||||
|
$php_pattern = '/(<%|%>|<\?php|<\?|\?>|<script\s+language\s*=\s*[\"\']?\s*php\s*[\"\']?\s*>)/';
|
||||||
|
$content = ob_get_clean();
|
||||||
|
$hash_array = $cached->hashes;
|
||||||
|
$hash_array = array_keys($hash_array);
|
||||||
|
$nocache_hash = '(' . implode('|', $hash_array) . ')';
|
||||||
|
$_template->cached->has_nocache_code = false;
|
||||||
|
// get text between non-cached items
|
||||||
|
$cache_split =
|
||||||
|
preg_split("!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
|
||||||
|
$content);
|
||||||
|
// get non-cached items
|
||||||
|
preg_match_all("!/\*%%SmartyNocache:{$nocache_hash}%%\*\/(.+?)/\*/%%SmartyNocache:{$nocache_hash}%%\*/!s",
|
||||||
|
$content,
|
||||||
|
$cache_parts);
|
||||||
|
$content = '';
|
||||||
|
// loop over items, stitch back together
|
||||||
|
foreach ($cache_split as $curr_idx => $curr_split) {
|
||||||
|
if (preg_match($php_pattern, $curr_split)) {
|
||||||
|
// escape PHP tags in template content
|
||||||
|
$php_split = preg_split($php_pattern,
|
||||||
|
$curr_split);
|
||||||
|
preg_match_all($php_pattern,
|
||||||
|
$curr_split,
|
||||||
|
$php_parts);
|
||||||
|
foreach ($php_split as $idx_php => $curr_php) {
|
||||||
|
$content .= $curr_php;
|
||||||
|
if (isset($php_parts[ 0 ][ $idx_php ])) {
|
||||||
|
$content .= "<?php echo '{$php_parts[ 1 ][ $idx_php ]}'; ?>\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$content .= $curr_split;
|
||||||
|
}
|
||||||
|
if (isset($cache_parts[ 0 ][ $curr_idx ])) {
|
||||||
|
$_template->cached->has_nocache_code = true;
|
||||||
|
$content .= $cache_parts[ 2 ][ $curr_idx ];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!$no_output_filter && !$_template->cached->has_nocache_code &&
|
||||||
|
(isset($_template->smarty->autoload_filters[ 'output' ]) ||
|
||||||
|
isset($_template->smarty->registered_filters[ 'output' ]))
|
||||||
|
) {
|
||||||
|
$content = $_template->smarty->ext->_filterHandler->runFilter('output', $content, $_template);
|
||||||
|
}
|
||||||
|
// write cache file content
|
||||||
|
$this->writeCachedContent($cached, $_template, $content);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Writes the content to cache resource
|
* Writes the content to cache resource
|
||||||
*
|
*
|
||||||
@@ -148,7 +159,6 @@ class Smarty_Internal_Runtime_UpdateCache
|
|||||||
if ($_template->smarty->cache_locking) {
|
if ($_template->smarty->cache_locking) {
|
||||||
$cached->handler->releaseLock($_template->smarty, $cached);
|
$cached->handler->releaseLock($_template->smarty, $cached);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
$cached->content = null;
|
$cached->content = null;
|
||||||
@@ -157,8 +167,6 @@ class Smarty_Internal_Runtime_UpdateCache
|
|||||||
$cached->valid = false;
|
$cached->valid = false;
|
||||||
$cached->processed = false;
|
$cached->processed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
Reference in New Issue
Block a user