Merge "Fix use of GenderCache in ApiPageSet::processTitlesArray"

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

diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php
index 7d8f67c..a1f199d 100644 (file)
--- a/includes/content/JsonContent.php
+++ b/includes/content/JsonContent.php
@@ -28,17 +28,6 @@ class JsonContent extends TextContent {
                parent::__construct( $text, $modelId );
        }
 
-       /**
-        * Decodes the JSON into a PHP associative array.
-        *
-        * @deprecated since 1.25 Use getData instead.
-        * @return array|null
-        */
-       public function getJsonData() {
-               wfDeprecated( __METHOD__, '1.25' );
-               return FormatJson::decode( $this->getNativeData(), true );
-       }
-
        /**
         * Decodes the JSON string.
         *
@@ -49,7 +38,7 @@ class JsonContent extends TextContent {
         */
        public function getData() {
                if ( $this->jsonParse === null ) {
-                       $this->jsonParse = FormatJson::parse( $this->getNativeData() );
+                       $this->jsonParse = FormatJson::parse( $this->getText() );
                }
                return $this->jsonParse;
        }
@@ -231,7 +220,7 @@ class JsonContent extends TextContent {
                        return Html::rawElement( 'td', [], $this->arrayTable( $val ) );
                }
 
-               return Html::element( 'td', [ 'class' => 'value' ], $this->primitiveValue( $val ) );
+               return Html::element( 'td', [ 'class' => 'mw-json-value' ], $this->primitiveValue( $val ) );
        }
 
        /**