diff options
Diffstat (limited to '')
| -rw-r--r-- | include/smarty/libs/plugins/modifier.regex_replace.php | 15 | ||||
| -rw-r--r-- | include/smarty/libs/plugins/outputfilter.trimwhitespace.php | 14 |
2 files changed, 20 insertions, 9 deletions
diff --git a/include/smarty/libs/plugins/modifier.regex_replace.php b/include/smarty/libs/plugins/modifier.regex_replace.php index d1f1545d8..100b58ce4 100644 --- a/include/smarty/libs/plugins/modifier.regex_replace.php +++ b/include/smarty/libs/plugins/modifier.regex_replace.php @@ -22,14 +22,25 @@ */ function smarty_modifier_regex_replace($string, $search, $replace) { + if(is_array($search)) { + foreach($search as $idx => $s) + $search[$idx] = _smarty_regex_replace_check($s); + } else { + $search = _smarty_regex_replace_check($search); + } + + return preg_replace($search, $replace, $string); +} + +function _smarty_regex_replace_check($search) +{ if (($pos = strpos($search,"\0")) !== false) $search = substr($search,0,$pos); if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) { /* remove eval-modifier from $search */ $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]); } - - return preg_replace($search, $replace, $string); + return $search; } /* vim: set expandtab: */ 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 |