From 380e0d0d6bb2e3fdc81d3fb062b6fc683f941301 Mon Sep 17 00:00:00 2001 From: "monte.ohrt" Date: Wed, 6 Aug 2008 17:07:15 +0000 Subject: [PATCH] fix problem with /e security check on arrays using regex_replace --- libs/plugins/modifier.regex_replace.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libs/plugins/modifier.regex_replace.php b/libs/plugins/modifier.regex_replace.php index d1f1545d..100b58ce 100644 --- a/libs/plugins/modifier.regex_replace.php +++ b/libs/plugins/modifier.regex_replace.php @@ -21,6 +21,18 @@ * @return string */ 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); @@ -28,8 +40,7 @@ function smarty_modifier_regex_replace($string, $search, $replace) /* 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: */