From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 17 Feb 2011 17:08:06 +0000 (+0000)
Subject: (bug 27492) Fix regexes for matching JS regexes which could get messed up by the... 
X-Git-Tag: 1.31.0-rc.0~31949
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=e519eadc99216916201371745ac61efd50473762;p=lhc%2Fweb%2Fwiklou.git

(bug 27492) Fix regexes for matching JS regexes which could get messed up by the minifier in extreme circumstances
---

diff --git a/includes/libs/JavaScriptDistiller.php b/includes/libs/JavaScriptDistiller.php
index 91d330b3e1..6ddaf8de3c 100644
--- a/includes/libs/JavaScriptDistiller.php
+++ b/includes/libs/JavaScriptDistiller.php
@@ -80,8 +80,8 @@ class JavaScriptDistiller {
 		$parser->add( '/\'([^\'\\\\]*(\\\\.[^\'\\\\]*)*)\'/', '$1' );
 		$parser->add( '/"([^"\\\\]*(\\\\.[^"\\\\]*)*)"/', '$1' );
 		// Protect regular expressions
-		$parser->add( '/[ \\t]+(\\/[^\\/\\r\\n\\*][^\\/\\r\\n]*\\/g?i?)/', '$2' );
-		$parser->add( '/[^\\w\\$\\/\'"*)\\?:]\\/[^\\/\\r\\n\\*][^\\/\\r\\n]*\\/g?i?/', '$1' );
+		$parser->add( '/([ \\t]+(\\/(?=[^\\/\\r\\n\\*])[^\\/\\\\]*(\\\\.[^\\/\\\\]*)*\\/(i|g)*))/', '$1' );
+		$parser->add( '/([^\\w\\$\\/\'"*)\\?:](\\/(?=[^\\/\\r\\n\\*])[^\\/\\\\]*(\\\\.[^\\/\\\\]*)*\\/(i|g)*))/', '$1' );
 		// Remove comments
 		$parser->add( '/\\/\\*(.|[\\r\\n])*?\\*\\//' );
 		// Preserve the newline after a C++-style comment -- bug 27046