Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 26 insertions, 0 deletions

diff --git a/includes/content/JsonContentHandler.php b/includes/content/JsonContentHandler.php
new file mode 100644
index 00000000..392ce37b
--- /dev/null
+++ b/includes/content/JsonContentHandler.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * JSON Schema Content Handler
+ *
+ * @file
+ *
+ * @author Ori Livneh <ori@wikimedia.org>
+ * @author Kunal Mehta <legoktm@gmail.com>
+ */
+
+/**
+ * @since 1.24
+ */
+class JsonContentHandler extends CodeContentHandler {
+
+	public function __construct( $modelId = CONTENT_MODEL_JSON ) {
+		parent::__construct( $modelId, array( CONTENT_FORMAT_JSON ) );
+	}
+
+	/**
+	 * @return string
+	 */
+	protected function getContentClass() {
+		return 'JsonContent';
+	}
+}