Ticket #1422: 1422.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*((?:[\w_][\w\d_]+))/', $varsMatches[1][$i], $varNameMatches ) ;
+                                
+                                for ( $j = 0 ; $j < $numVarNameMatches ; $j++ )
+                                {
+                                        $vars[] = $varNameMatches[1][$j] ;
+                                }
                         }
 
                         $processed = $this->_ProcessVars( $processed, $vars ) ;