Merge "Improve "selfmove" message's wording"

[lhc/web/wiklou.git] / includes / content / JsonContent.php

diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php
index 40d9277..2b94f3f 100644 (file)
--- a/includes/content/JsonContent.php
+++ b/includes/content/JsonContent.php
@@ -22,6 +22,7 @@ class JsonContent extends TextContent {
 
        /**
         * @param string $text JSON
+        * @param string $modelId
         */
        public function __construct( $text, $modelId = CONTENT_MODEL_JSON ) {
                parent::__construct( $text, $modelId );
@@ -86,7 +87,7 @@ class JsonContent extends TextContent {
                        return $this;
                }
 
-               return new static( $this->beautifyJSON() );
+               return new static( self::normalizeLineEndings( $this->beautifyJSON() ) );
        }
 
        /**
@@ -96,7 +97,7 @@ class JsonContent extends TextContent {
         * @param int $revId
         * @param ParserOptions $options
         * @param bool $generateHtml
-        * @param ParserOutput $output
+        * @param ParserOutput &$output
         */
        protected function fillParserOutput( Title $title, $revId,
                ParserOptions $options, $generateHtml, ParserOutput &$output