cvs: smarty /libs/plugins modifier.regex_replace.php

mohrt		Fri Mar  3 14:42:01 2006 UTC

  Modified files:              
    /smarty/libs/plugins	modifier.regex_replace.php 
  Log:
  fix problem with allowing "e" modifier
  
  
http://cvs.php.net/viewcvs.cgi/smarty/libs/plugins/modifier.regex_replace.php?r1=1.4&r2=1.5&diff_format=u
Index: smarty/libs/plugins/modifier.regex_replace.php
diff -u smarty/libs/plugins/modifier.regex_replace.php:1.4 smarty/libs/plugins/modifier.regex_replace.php:1.5
--- smarty/libs/plugins/modifier.regex_replace.php:1.4	Tue Oct 11 16:22:56 2005
+++ smarty/libs/plugins/modifier.regex_replace.php	Fri Mar  3 14:42:01 2006
@@ -11,7 +11,7 @@
  *
  * Type:     modifier<br>
  * Name:     regex_replace<br>
- * Purpose:  regular epxression search/replace
+ * Purpose:  regular expression search/replace
  * @link http://smarty.php.net/manual/en/language.modifier.regex.replace.php
  *          regex_replace (Smarty online manual)
  * @author   Monte Ohrt <monte at ohrt dot com>
@@ -22,10 +22,11 @@
  */
 function smarty_modifier_regex_replace($string, $search, $replace)
 {
-    if (preg_match('!\W(\w+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
+    if (preg_match('!\W([\w\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
         /* remove eval-modifier from $search */
-        $search = substr($search, 0, -strlen($match[1])) . str_replace('e', '', $match[1]);
+        $search = substr($search, 0, -strlen($match[1])) . str_replace(array(' ','e'), array('',''), $match[1]);
     }
+    
     return preg_replace($search, $replace, $string);
 }