Ticket #1422: 1422_2.patch

_source/includes/fckfunctionprocessor.inc

@@ -56 +56 @@
                 if ( !$this->_IsGlobal )
                         $processed = $this->_ProcessVars( $processed, $this->_Parameters ) ;
 
-                $numVarMatches = preg_match_all( '/\bvar\b\s+([\w_][\w\d_]+)/', $processed, $varsMatches ) ;
-
+                $numVarMatches = preg_match_all( '/\bvar\b\s+(.+?)(?=;)/', $processed, $varsMatches ) ;
+                
                 if ( $numVarMatches > 0 )
                 {
                         $vars = array() ;
 
                         for ( $i = 0 ; $i < $numVarMatches ; $i++ )
                         {
-                                $vars[] = $varsMatches[1][$i] ;
+                                $numVarNameMatches = preg_match_all( '/(?:^|,)\s*([^\s=,]+)/', $varsMatches[1][$i], $varNameMatches ) ;
+                                
+                                for ( $j = 0 ; $j < $numVarNameMatches ; $j++ )
+                                {
+                                        $vars[] = $varNameMatches[1][$j] ;
+                                }
                         }
 
                         $processed = $this->_ProcessVars( $processed, $vars ) ;
@@ -78 +83 @@
                 foreach ( $vars as $var )
                 {
                         if ( strlen( $var) > 1 )
-                                $source = preg_replace( '/(?<!\w|\d|\.)' . $var . '(?!\w|\d)/', $this->_GetVarName(), $source ) ;
+                                $source = preg_replace( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d)/', $this->_GetVarName(), $source ) ;
                 }
 
                 return $source ;
@@ -94 +99 @@
 
                 $var = $this->_VarPrefix . $this->_VarChars[ $this->_LastCharIndex++ ] ;
 
-                if ( preg_match( '/(?<!\w|\d|\.)' . $var . '(?!\w|\d)/', $this->_Function ) )
+                if ( preg_match( '/(?<!\w|\d|\.)' . preg_quote( $var ) . '(?!\w|\d)/', $this->_Function ) )
                         return $this->_GetVarName() ;
                 else
                         return $var ;
@@ -116 +121 @@
         }
 }
 
-?>
- No newline at end of file
+?>