Merge "maintenance: Sanity check that --replicadb isn't using the master in sql.php"

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

diff --git a/includes/content/TextContentHandler.php b/includes/content/TextContentHandler.php
index ced2a66..e3dc187 100644 (file)
--- a/includes/content/TextContentHandler.php
+++ b/includes/content/TextContentHandler.php
@@ -30,24 +30,22 @@
  */
 class TextContentHandler extends ContentHandler {
 
-       // @codingStandardsIgnoreStart T59585
        public function __construct( $modelId = CONTENT_MODEL_TEXT, $formats = [ CONTENT_FORMAT_TEXT ] ) {
                parent::__construct( $modelId, $formats );
        }
-       // @codingStandardsIgnoreEnd
 
        /**
         * Returns the content's text as-is.
         *
         * @param Content $content
-        * @param string $format The serialization format to check
+        * @param string|null $format The serialization format to check
         *
         * @return mixed
         */
        public function serializeContent( Content $content, $format = null ) {
                $this->checkFormat( $format );
 
-               return $content->getNativeData();
+               return $content->getText();
        }
 
        /**
@@ -110,7 +108,7 @@ class TextContentHandler extends ContentHandler {
         * @since 1.21
         *
         * @param string $text Serialized form of the content
-        * @param string $format The format used for serialization
+        * @param string|null $format The format used for serialization
         *
         * @return Content The TextContent object wrapping $text
         */