From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 13 Oct 2014 22:22:10 +0000 (+0000)
Subject: Merge "API: Make jsonfm the default output format"
X-Git-Tag: 1.31.0-rc.0~13622
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=f0f675be341d9797c214632167f54935fdc77d1b;hp=2e65d68c731d92f165e009d9a7999111e6c42282;p=lhc%2Fweb%2Fwiklou.git

Merge "API: Make jsonfm the default output format"
---

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 65ccdc5dc5..69c5375467 100644
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -44,6 +44,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