Merge "Show the revision list immediately on "umerge" log action links"

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

diff --git a/includes/content/JSONContentHandler.php b/includes/content/JSONContentHandler.php
index 6b77527..b0b7aae 100644 (file)
--- a/includes/content/JSONContentHandler.php
+++ b/includes/content/JSONContentHandler.php
@@ -13,37 +13,15 @@
  */
 class JSONContentHandler extends TextContentHandler {
 
-       /**
-        * The class name of objects that should be created
-        *
-        * @var string
-        */
-       protected $contentClass = 'JSONContent';
-
        public function __construct( $modelId = CONTENT_MODEL_JSON ) {
                parent::__construct( $modelId, array( CONTENT_FORMAT_JSON ) );
        }
 
        /**
-        * Unserializes a JSONContent object.
-        *
-        * @param string $text Serialized form of the content
-        * @param null|string $format The format used for serialization
-        *
-        * @return JSONContent
-        */
-       public function unserializeContent( $text, $format = null ) {
-               $this->checkFormat( $format );
-               return new $this->contentClass( $text );
-       }
-
-       /**
-        * Creates an empty JSONContent object.
-        *
-        * @return JSONContent
+        * @return string
         */
-       public function makeEmptyContent() {
-               return new $this->contentClass( '' );
+       protected function getContentClass() {
+               return 'JSONContent';
        }
 
        /**