* 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 1084b8f..184e4d6 100644 (file)
--- 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