From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Tue, 16 Sep 2014 20:45:09 +0000 (-0400)
Subject: API: Make jsonfm the default output format
X-Git-Tag: 1.31.0-rc.0~13622^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=62d8a060dcc30c5c6b7ed571e8c9a843f25bbda3;p=lhc%2Fweb%2Fwiklou.git

API: Make jsonfm the default output format

Now that action=help isn't requiring xmlfm for sane display, make jsonfm
the default.

Change-Id: I515c322f31243081ed1315a17befe9792237eeaa
---

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index c01fa412fd..c34db83f41 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -30,6 +30,7 @@ production.
   language by default. 'uselang' is now a recognized API parameter;
   "uselang=user" may be used to select the language from the current user's
   preferences.
+* Default output format for the API is now jsonfm.
 
 === Action API internal changes in 1.25 ===
 * ApiHelp has been rewritten to support i18n and paginated HTML output.
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 836853d925..1dc3dc447d 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -42,7 +42,7 @@ class ApiMain extends ApiBase {
 	/**
 	 * When no format parameter is given, this format will be used
 	 */
-	const API_DEFAULT_FORMAT = 'xmlfm';
+	const API_DEFAULT_FORMAT = 'jsonfm';
 
 	/**
 	 * List of available modules: action name => module class