Changeset 1978 for FCKeditor/trunk

Timestamp:

05/09/08 18:21:46 (5 years ago)

Author:

fredck

Message:

Fixed #1239 and #2185 : No semicolon is appended after closing curly brackets it followed by "finally", "while", "'", ";" or ")".

File:

• FCKeditor/trunk/_dev/releaser/fckreleaser.php (modified) (3 diffs)

FCKeditor/trunk/_dev/releaser/fckreleaser.php

@@ -1 @@
-#!/usr/bin/php -q
+#!/usr/bin/php -q
 <?php
 /*
@@ -128 +128 @@
 class FCKReleaser
 {
-        var $_PreProcessExtensions = array( 'js','html','asp','aspx','cfc','cfm','jsp','css','xml','txt','java','php','cgi','pl','lasso','py' ) ;
+        var $_PreProcessExtensions = array( 'js','html','asp','aspx','ascx','cfc','cfm','jsp','css','xml','txt','java','php','cgi','pl','lasso','py','config' ) ;
 
         var $SourcesDir ;
@@ -627 +627 @@
                         ' ', $script ) ;
 
-                // Concatenate lines that end with "}" using a ";" (except for "else" and "catch" cases).
+                // Concatenate lines that end with "}" using a ";", except for "else",
+                // "while", "catch" and "finally" cases, or when followed by, "'", ";",
+                // "}" or ")".
                 $script = preg_replace(
-                        '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|}))/s',
+                        '/\s*}\s*[\n\r]+\s*(?!\s*(else|catch|finally|while|[}\),;]))/s',
                         '};', $script ) ;