Changeset 2246

Timestamp:

07/21/08 14:21:35 (5 years ago)

Author:

fredck

Message:

Updated FCKpackager (again).

File:

• CKEditor/branches/prototype/_dev/packager/fckpackager.php (modified) (2 diffs)

CKEditor/branches/prototype/_dev/packager/fckpackager.php

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