Changeset 2333 for FCKpackager/trunk

Timestamp:

2008-08-05 17:30:29 (5 months ago)

Author:

fredck

Message:

The changes made with [2322] where not considering ternary operators. Fixed it.

Files:

• FCKpackager/trunk/_source/includes/fckfunctionprocessor.inc (modified) (1 diff)

FCKpackager/trunk/_source/includes/fckfunctionprocessor.inc

@@ -93 +93 @@
                 {
                         if ( strlen( $var) > 1 )
-                                $source = preg_replace( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d|(?:\s*:))/', $this->_GetVarName(), $source ) ;
+                        {
+                                $varName = $this->_GetVarName();
+                                $source = preg_replace( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d|:)/', $varName, $source ) ;
+
+                                // The above regex exclude names placed before ":", but it is not true for ternary operators.
+                                $source = preg_replace( '/(?<=\?)' . preg_quote( $var ) . '(?=:)/', $varName, $source ) ;
+                        }
                 }