Upgrade smarty from 2.6.18 to 2.6.30

[contagged] / inc / smarty / plugins / modifier.regex_replace.php

diff --git a/inc/smarty/plugins/modifier.regex_replace.php b/inc/smarty/plugins/modifier.regex_replace.php
index d4d20309d2d3b51f9723eea0229ac263fcaf4e56..100b58ce4b1e7a969bef4fdee59f17d36f56f41c 100644 (file)
--- a/inc/smarty/plugins/modifier.regex_replace.php
+++ b/inc/smarty/plugins/modifier.regex_replace.php
@@ -22,12 +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: */