mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-04 18:34:27 +02:00
fixed greedy str_replace in outputfilter.trimwhitespace.php
This commit is contained in:
@@ -44,17 +44,26 @@
|
|||||||
|
|
||||||
// replace script blocks
|
// replace script blocks
|
||||||
foreach($_script_blocks as $curr_block) {
|
foreach($_script_blocks as $curr_block) {
|
||||||
$source = str_replace("@@@SMARTY:TRIM:SCRIPT@@@",$curr_block, $source);
|
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$curr_block, $source);
|
||||||
}
|
}
|
||||||
// replace pre blocks
|
// replace pre blocks
|
||||||
foreach($_pre_blocks as $curr_block) {
|
foreach($_pre_blocks as $curr_block) {
|
||||||
$source = str_replace("@@@SMARTY:TRIM:PRE@@@",$curr_block, $source);
|
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$curr_block, $source);
|
||||||
}
|
}
|
||||||
// replace textarea blocks
|
// replace textarea blocks
|
||||||
foreach($_textarea_blocks as $curr_block) {
|
foreach($_textarea_blocks as $curr_block) {
|
||||||
$source = str_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$curr_block, $source);
|
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$curr_block, $source);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $source;
|
return $source;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function smarty_outputfilter_trimwhitespace_replace($search, $replace, &$subject) {
|
||||||
|
if (($_pos=strpos($subject, $search))!==false) {
|
||||||
|
$subject = substr($subject, 0, $_pos)
|
||||||
|
. $replace
|
||||||
|
. substr($subject, $_pos+strlen($search));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
Reference in New Issue
Block a user