| Index: trunk/phase3/includes/libs/JavaScriptDistiller.php |
| — | — | @@ -80,8 +80,8 @@ |
| 81 | 81 | $parser->add( '/\'([^\'\\\\]*(\\\\.[^\'\\\\]*)*)\'/', '$1' ); |
| 82 | 82 | $parser->add( '/"([^"\\\\]*(\\\\.[^"\\\\]*)*)"/', '$1' ); |
| 83 | 83 | // Protect regular expressions |
| 84 | | - $parser->add( '/[ \\t]+((\\/[^\\/\\\\]*(\\\\.[^\\/\\\\]*)*\\/(i|g)*))/', '$1' ); |
| 85 | | - $parser->add( '/([^\\w\\$\\/\'"*)\\?:](\\/[^\\/\\\\]*(\\\\.[^\\/\\\\]*)*\\/(i|g)*))/', '$1' ); |
| | 84 | + $parser->add( '/[ \\t]+((\\/[^\\r\\n\\*][^\\/\\r\\n\\\\]*(\\\\.[^\\/\\r\\n\\\\]*)*\\/(i|g)*))/', '$1' ); |
| | 85 | + $parser->add( '/([^\\w\\$\\/\'"*)\\?:](\\/[^\\r\\n\\*][^\\/\\r\\n\\\\]*(\\\\.[^\\/\\r\\n\\\\]*)*\\/(i|g)*))/', '$1' ); |
| 86 | 86 | // Remove comments |
| 87 | 87 | $parser->add( '/\\/\\*(.|[\\r\\n])*?\\*\\//' ); |
| 88 | 88 | // Preserve the newline after a C++-style comment -- bug 27046 |