Changeset 2268 for FCKpackager/trunk/_source/includes/fckjavascriptcompressor.inc

Timestamp:

2008-07-23 14:29:20 (6 months ago)

Author:

fredck

Message:

Fixed #1422 : Multiple variables declared in a single "var" statement are now properly renamed by the compressor.
This fix impacted also in the renaming of nested functions.

Files:

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

FCKpackager/trunk/_source/includes/fckjavascriptcompressor.inc

@@ -140 +140 @@
                         $parameters = preg_split( '/\s*,\s*/', trim( $match[1] ) ) ;
 
-                $funcProcessor = new FCKFunctionProcessor( $match[0], $parameters, false ) ;
+                $hasfuncProcessor = isset( $GLOBALS['funcProcessor'] ) ;
 
-                return $funcProcessor->Process() ;
+                if ( $hasfuncProcessor != TRUE )
+                        $GLOBALS['funcProcessor'] = new FCKFunctionProcessor( $match[0], $parameters, false ) ;
+                else
+                {
+                        $GLOBALS['funcProcessor']->_Function = $match[0];
+                        $GLOBALS['funcProcessor']->_Parameters = $parameters;
+                }
+
+                $processed = $GLOBALS['funcProcessor']->Process() ;
+                
+                $processed = substr_replace( $processed, '', 0, 8 ) ;
+
+                $processed = FCKJavaScriptCompressor::_ProcessFunctions( $processed ) ;
+
+                if ( $hasfuncProcessor != TRUE )
+                        unset( $GLOBALS['funcProcessor'] ) ;
+                
+                return 'function'. $processed ;
         }
 }