mirror of
https://github.com/smarty-php/smarty.git
synced 2025-08-06 03:14:27 +02:00
fixed ordering of replacements in trimwhitespace output filter
Thanks to Getty from IRC for reporting this.
This commit is contained in:
1
NEWS
1
NEWS
@@ -1,3 +1,4 @@
|
||||
- fixed ordering of replacements in trimwhitespace output filter (Getty, boots)
|
||||
- update mailto function plugin to work around a firefox/thunderbird
|
||||
escaping bug (elijahlofgren, boots)
|
||||
- emulate %l in the date_format modifier on windows (boots)
|
||||
|
@@ -50,13 +50,13 @@ function smarty_outputfilter_trimwhitespace($source, &$smarty)
|
||||
$source = trim(preg_replace('/((?<!\?>)\n)[\s]+/m', '\1', $source));
|
||||
|
||||
// replace script blocks
|
||||
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_script_blocks, $source);
|
||||
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_script_blocks, $source);
|
||||
|
||||
// replace pre blocks
|
||||
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:PRE@@@",$_pre_blocks, $source);
|
||||
|
||||
// replace textarea blocks
|
||||
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:TEXTAREA@@@",$_textarea_blocks, $source);
|
||||
smarty_outputfilter_trimwhitespace_replace("@@@SMARTY:TRIM:SCRIPT@@@",$_textarea_blocks, $source);
|
||||
|
||||
return $source;
|
||||
}
|
||||
|
Reference in New Issue
Block a user