From: wctaiwan <wctaiwan@gmail.com>
Date: Sat, 10 Jan 2015 05:08:02 +0000 (-0500)
Subject: Let subclasses specify content model in JsonContent
X-Git-Tag: 1.31.0-rc.0~12726
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22upgrade%22%2C%22reinstall=non%22%29%20.%20%22?a=commitdiff_plain;h=a90b4c5809938701a3864979f38e518cc0c5aefa;p=lhc%2Fweb%2Fwiklou.git

Let subclasses specify content model in JsonContent

This is needed for extensions that subclass JsonContent.

Follows up Ifed379ba4674a8289b55
Change-Id: I2f4f9cb343c2ab3ee802b584d3c79d0fafadf9e7
---

diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php
index ff3b25b8b2..df90f229f4 100644
--- a/includes/content/JsonContent.php
+++ b/includes/content/JsonContent.php
@@ -25,8 +25,8 @@ class JsonContent extends TextContent {
 	/**
 	 * @param string $text JSON
 	 */
-	public function __construct( $text ) {
-		parent::__construct( $text, CONTENT_MODEL_JSON );
+	public function __construct( $text, $modelId = CONTENT_MODEL_JSON ) {
+		parent::__construct( $text, $modelId );
 	}
 
 	/**