cvs: smarty / NEWS /libs/plugins outputfilter.trimwhitespace.php
[email protected] ("boots") Fri, 23 Jun 2006 08:34:31 -0000
| Newsgroups | php.smarty.cvs |
|---|---|
| Message-ID | <cvsboots1151051671@cvsserver> |
boots Fri Jun 23 08:34:31 2006 UTC
Modified files:
/smarty NEWS
/smarty/libs/plugins outputfilter.trimwhitespace.php
Log:
fixed ordering of replacements in trimwhitespace output filter
Thanks to Getty from IRC for reporting this.
http://cvs.php.net/viewvc.cgi/smarty/NEWS?r1=1.535&r2=1.536&diff_format=u
Index: smarty/NEWS
diff -u smarty/NEWS:1.535 smarty/NEWS:1.536
--- smarty/NEWS:1.535 Tue Jun 20 19:10:56 2006
+++ smarty/NEWS Fri Jun 23 08:34:31 2006
@@ -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)
http://cvs.php.net/viewvc.cgi/smarty/libs/plugins/outputfilter.trimwhitespace.php?r1=1.9&r2=1.10&diff_format=u
Index: smarty/libs/plugins/outputfilter.trimwhitespace.php
diff -u smarty/libs/plugins/outputfilter.trimwhitespace.php:1.9 smarty/libs/plugins/outputfilter.trimwhitespace.php:1.10
--- smarty/libs/plugins/outputfilter.trimwhitespace.php:1.9 Fri Jan 21 17:46:15 2005
+++ smarty/libs/plugins/outputfilter.trimwhitespace.php Fri Jun 23 08:34:31 2006
@@ -50,13 +50,13 @@
$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;
}