diff options
author | rvelices <rv-github@modusoptimus.com> | 2008-09-16 10:17:20 +0000 |
---|---|---|
committer | rvelices <rv-github@modusoptimus.com> | 2008-09-16 10:17:20 +0000 |
commit | 159fbc8377832ff8e931cef0413ee571c494ac84 (patch) | |
tree | 7b4446529a561ceef311a8d07fcdb7ce5449861b /include/smarty/libs/plugins/outputfilter.trimwhitespace.php | |
parent | eef8aa8838ae6fede0dce3b4df65d140e745e830 (diff) |
- upgrade smarty to latest release 2.6.20
git-svn-id: http://piwigo.org/svn/trunk@2538 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | include/smarty/libs/plugins/outputfilter.trimwhitespace.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/smarty/libs/plugins/outputfilter.trimwhitespace.php b/include/smarty/libs/plugins/outputfilter.trimwhitespace.php index 97b0d21e8..739fa39b0 100644 --- a/include/smarty/libs/plugins/outputfilter.trimwhitespace.php +++ b/include/smarty/libs/plugins/outputfilter.trimwhitespace.php @@ -28,21 +28,21 @@ function smarty_outputfilter_trimwhitespace($source, &$smarty) { // Pull out the script blocks - preg_match_all("!<script[^>]+>.*?</script>!is", $source, $match); + preg_match_all("!<script[^>]*?>.*?</script>!is", $source, $match); $_script_blocks = $match[0]; - $source = preg_replace("!<script[^>]+>.*?</script>!is", + $source = preg_replace("!<script[^>]*?>.*?</script>!is", '@@@SMARTY:TRIM:SCRIPT@@@', $source); // Pull out the pre blocks - preg_match_all("!<pre>.*?</pre>!is", $source, $match); + preg_match_all("!<pre[^>]*?>.*?</pre>!is", $source, $match); $_pre_blocks = $match[0]; - $source = preg_replace("!<pre>.*?</pre>!is", + $source = preg_replace("!<pre[^>]*?>.*?</pre>!is", '@@@SMARTY:TRIM:PRE@@@', $source); - + // Pull out the textarea blocks - preg_match_all("!<textarea[^>]+>.*?</textarea>!is", $source, $match); + preg_match_all("!<textarea[^>]*?>.*?</textarea>!is", $source, $match); $_textarea_blocks = $match[0]; - $source = preg_replace("!<textarea[^>]+>.*?</textarea>!is", + $source = preg_replace("!<textarea[^>]*?>.*?</textarea>!is", '@@@SMARTY:TRIM:TEXTAREA@@@', $source); // remove all leading spaces, tabs and carriage returns NOT |