Changeset 2238 for FCKpackager/trunk

Timestamp:

2008-07-21 12:27:07 (5 months ago)

Author:

fredck

Message:

Updated the single file and the exe version with the changes introduced with [2237].

Location:

FCKpackager/trunk

Files:

• fckpackager.exe (modified) (previous)
• fckpackager.php (modified) (2 diffs)

FCKpackager/trunk/fckpackager.php

@@ -309 +309 @@
                 // Remove "/* */" comments
                 $script = preg_replace(
-                        '/(?m-s:^\s*\/\*).*?\*\//s',
+                        '/\/\*.*?\*\//s',
                         '', $script ) ;
 
@@ -700 +700 @@
         function ProtectStrings( $source )
         {
+                // Catches string literals, regular expressions and conditional comments.
                 return preg_replace_callback(
-                        '/(?:("|\').*?(?<!\\\\)\1|(?<![\/\\\\])\/[^\/\*].*?(?<!\\\\)\/)/',
+                        '/(?:("|\').*?(?<!\\\\)\1)|(?:(?<![\*\/\\\\])\/[^\/\*].*?(?<!\\\\)\/(?!\s+[\w\d])(?=.*;))|(?s:\/\*@(?:cc_on|if|elif|else|end).*?@\*\/)/',
                         array( &$this, '_ProtectStringsMatch' ), $source ) ;
         }