Merge "Add default type param for recentchanges and watchlist query api modules"

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index cdef220..466a786 100644 (file)
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -274,6 +274,8 @@ production.
 * The following classes have been deprecated and may be removed in a future
   release:
   * ApiQueryDeletedrevs
+* Default type param for ApiQueryWatchlist and ApiQueryRecentChanges has
+  been changed from all types (e.g. including 'external') to 'edit|new|log'.
 
 === Languages updated in 1.25 ===
 

diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index fd73afb..bfdc5ab 100644 (file)
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -688,6 +688,7 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase {
                                ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
                        ),
                        'type' => array(
+                               ApiBase::PARAM_DFLT => 'edit|new|log',
                                ApiBase::PARAM_ISMULTI => true,
                                ApiBase::PARAM_TYPE => array(
                                        'edit',

diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index 2cea1a6..11008cf 100644 (file)
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -499,6 +499,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
                                )
                        ),
                        'type' => array(
+                               ApiBase::PARAM_DFLT => 'edit|new|log',
                                ApiBase::PARAM_ISMULTI => true,
                                ApiBase::PARAM_TYPE => array(
                                        'edit',