From 4645fb90f56ec1144c70cc0e40674dc477b4b3e4 Mon Sep 17 00:00:00 2001
From: Aryeh Gregor <simetrical@users.mediawiki.org>
Date: Thu, 11 Jan 2007 20:55:27 +0000
Subject: [PATCH] * Escape '$' also for double quotes * This appears to be
 ready for mass production use.  Any objections to committing php
 rebuildLanguage.php --lang=all?

---
 maintenance/language/writeMessagesArray.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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
-- 
2.20.1