From 7aa88fbacea41d416a0e54abbaa4abbbcc5cdbca Mon Sep 17 00:00:00 2001 From: "monte.ohrt" Date: Wed, 5 Mar 2008 13:47:28 +0000 Subject: [PATCH] revert to last versio --- libs/plugins/outputfilter.trimwhitespace.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/plugins/outputfilter.trimwhitespace.php b/libs/plugins/outputfilter.trimwhitespace.php index a4db20c8..97b0d21e 100644 --- a/libs/plugins/outputfilter.trimwhitespace.php +++ b/libs/plugins/outputfilter.trimwhitespace.php @@ -28,21 +28,21 @@ function smarty_outputfilter_trimwhitespace($source, &$smarty) { // Pull out the script blocks - preg_match_all("!]+>.*!is", $source, $match); + preg_match_all("!]+>.*?!is", $source, $match); $_script_blocks = $match[0]; - $source = preg_replace("!]+>.*!is", + $source = preg_replace("!]+>.*?!is", '@@@SMARTY:TRIM:SCRIPT@@@', $source); // Pull out the pre blocks - preg_match_all("!
.*
!is", $source, $match); + preg_match_all("!
.*?
!is", $source, $match); $_pre_blocks = $match[0]; - $source = preg_replace("!
.*
!is", + $source = preg_replace("!
.*?
!is", '@@@SMARTY:TRIM:PRE@@@', $source); // Pull out the textarea blocks - preg_match_all("!]+>.*!is", $source, $match); + preg_match_all("!]+>.*?!is", $source, $match); $_textarea_blocks = $match[0]; - $source = preg_replace("!]+>.*!is", + $source = preg_replace("!]+>.*?!is", '@@@SMARTY:TRIM:TEXTAREA@@@', $source); // remove all leading spaces, tabs and carriage returns NOT