Merge "Normalize "\r" newlines in preSaveTransform"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 16 Dec 2014 21:07:50 +0000 (21:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 16 Dec 2014 21:07:50 +0000 (21:07 +0000)
includes/parser/Parser.php

index 5c8253a..a9daa22 100644 (file)
@@ -4862,6 +4862,7 @@ class Parser {
 
                $pairs = array(
                        "\r\n" => "\n",
+                       "\r" => "\n",
                );
                $text = str_replace( array_keys( $pairs ), array_values( $pairs ), $text );
                if ( $options->getPreSaveTransform() ) {