From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Thu, 11 Jan 2007 20:55:27 +0000 (+0000)
Subject: * Escape '$' also for double quotes
X-Git-Tag: 1.31.0-rc.0~54495
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=4645fb90f56ec1144c70cc0e40674dc477b4b3e4;p=lhc%2Fweb%2Fwiklou.git

* Escape '$' also for double quotes
* This appears to be ready for mass production use.  Any objections to committing php rebuildLanguage.php --lang=all?
---

diff --git a/maintenance/language/writeMessagesArray.inc b/maintenance/language/writeMessagesArray.inc
index 1084b8f8a9..184e4d6581 100644
--- a/maintenance/language/writeMessagesArray.inc
+++ b/maintenance/language/writeMessagesArray.inc
@@ -99,8 +99,10 @@ function writeMessagesBlock( $name, $comment, $messages, $ignoredComments ) {
 			$blockText .= "\"$value\"";
 		} else {
 			# Pick the less numerous one to escape
-			$quote = substr_count( $value, '"' ) >= substr_count( $value, "'" ) ? "'" : '"';
-			$blockText .= $quote . addcslashes( $value, $quote.'\\' ) . $quote;
+			$quote = substr_count( $value, '"' ) + substr_count( $value, '$' ) >= substr_count( $value, "'" ) ? "'" : '"';
+			if ('"' == $quote) { $extra = '$'; }
+			else { $extra = ''; }
+			$blockText .= $quote . addcslashes( $value, $quote.'\\'.$extra ) . $quote;
 		}
 
 		# Comma