Merge "Improve wfEscapeWikiText, part 2"

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 0c92ab6..414c822 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2032,6 +2032,10 @@ function wfEscapeWikiText( $text ) {
                        "\n*" => "\n*", "\r*" => "\r*",
                        "\n:" => "\n:", "\r:" => "\r:",
                        "\n " => "\n ", "\r " => "\r ",
+                       "\n\n" => "\n
", "\r\n" => "
\n",
+                       "\n\r" => "\n
", "\r\r" => "\r
",
+                       "\n\t" => "\n	", "\r\t" => "\r	", // "\n\t\n" is treated like "\n\n"
+                       "\n----" => "\n----", "\r----" => "\r----",
                        '__' => '__', '://' => '://',
                );