Changeset 2242 for FCKpackager/trunk

Timestamp:

2008-07-21 13:50:45 (5 months ago)

Author:

fredck

Message:

Fixed and issue introduced with [2237]. The rule of requiring lines containing regexes to have a ";" doesn't work on cases like "if ( ! /regex/.test( ) )". It now only requires division literals to be followed by spaces.

Files:

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

FCKpackager/trunk/_source/includes/fckstringsprocessor.inc

@@ -34 +34 @@
                 // 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:\/\*@(?:cc_on|if|elif|else|end).*?@\*\/)/',
                         array( &$this, '_ProtectStringsMatch' ), $source ) ;
         }