From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 8 Feb 2011 10:26:30 +0000 (+0000)
Subject: Reimplement r80900, was lost when code was moved around
X-Git-Tag: 1.31.0-rc.0~32124
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=158c26e49b6f7c69c20fa0b14722092180220a84;p=lhc%2Fweb%2Fwiklou.git

Reimplement r80900, was lost when code was moved around
---

diff --git a/includes/libs/JavaScriptDistiller.php b/includes/libs/JavaScriptDistiller.php
index 3e0a00f8fe..dd0c35d7f8 100644
--- a/includes/libs/JavaScriptDistiller.php
+++ b/includes/libs/JavaScriptDistiller.php
@@ -77,8 +77,8 @@ class JavaScriptDistiller {
 		// Protect strings. The original code had [^\'\\v] here, but that didn't armor multiline
 		// strings correctly. This also armors multiline strings that don't have backslashes at the
 		// end of the line (these are invalid), but that's fine because we're just armoring here.
-		$parser->add( '/\'[^\']*\'/', '$1' );
-		$parser->add( '/"[^"]*"/', '$1' );
+		$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' );