Merge "API: Make jsonfm the default output format"

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index 65ccdc5..69c5375 100644 (file)
--- 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 836853d..1dc3dc4 100644 (file)
--- 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