From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Tue, 20 Dec 2016 19:40:03 +0000 (-0500)
Subject: ApiQueryWatchlist: Handle empty wltypes
X-Git-Tag: 1.31.0-rc.0~4502^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=83ead540ae4d9b84a0792022a6a356102ec84490;p=lhc%2Fweb%2Fwiklou.git

ApiQueryWatchlist: Handle empty wltypes

The pre-WatchedItemQueryService code used ApiQueyrBase::addWhereFld()
which filters out empty arrays. WatchedItemQueryService doesn't do that.

Bug: T153733
Change-Id: I3416b5a05c9751303b5c28a8b6d9cb746a101f73
---

diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index 6b5ceb703f..3f597511a1 100644
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -151,7 +151,10 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 
 		if ( !is_null( $params['type'] ) ) {
 			try {
-				$options['rcTypes'] = RecentChange::parseToRCType( $params['type'] );
+				$rcTypes = RecentChange::parseToRCType( $params['type'] );
+				if ( $rcTypes ) {
+					$options['rcTypes'] = $rcTypes;
+				}
 			} catch ( Exception $e ) {
 				ApiBase::dieDebug( __METHOD__, $e->getMessage() );
 			}