X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fcontent%2FJsonContent.php;h=2cd1fb3b505c3df5573983740abe4b0bcc26ccb8;hb=37ef56fadd17089b2dd945cecf834683a62cd1b7;hp=7d8f67ce9db579d9cf730a22e20dff4011e16bee;hpb=9a6b2a4fffb82840d0bf780eb4ecb873ad64fa54;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php
index 7d8f67ce9d..2cd1fb3b50 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;
 	}