X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fcontent%2FJsonContent.php;h=a1f199de2fab5d02dd673efc453c380a1942dfd6;hb=22f137ced85fe4841c71ba6c2b9faf6199b5a539;hp=7d8f67ce9db579d9cf730a22e20dff4011e16bee;hpb=16ef3e79c4c52aa6b74563b7eadcfc9792e7a4c4;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php index 7d8f67ce9d..a1f199de2f 100644 --- 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 ) ); } /**