From: Sam Reed <reedy@users.mediawiki.org>
Date: Tue, 24 May 2011 16:04:03 +0000 (+0000)
Subject: * (bug 29120) ApiQueryLogEvents: let letype accept multiple values
X-Git-Tag: 1.31.0-rc.0~29977
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=cfd071328f5c9fe8a2f256a2893316bc7e53478f;p=lhc%2Fweb%2Fwiklou.git

* (bug 29120) ApiQueryLogEvents: let letype accept multiple values

Description already hinted at multiple
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 1e7bf62e67..224b6eb9c9 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -90,6 +90,7 @@ production.
   title inputs
 * (bug 20699) API watchlist should list log-events
 * (bug 29070) Add token to action=watch
+* (bug 29120) ApiQueryLogEvents: let letype accept multiple values
 
 === Languages updated in 1.19 ===
 
diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index f69b7a998d..234d47c6d0 100644
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -114,8 +114,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
 			list( $type, $action ) = explode( '/', $params['action'] );
 			$this->addWhereFld( 'log_type', $type );
 			$this->addWhereFld( 'log_action', $action );
-		}
-		else if ( !is_null( $params['type'] ) ) {
+		} else if ( !is_null( $params['type'] ) ) {
 			$this->addWhereFld( 'log_type', $params['type'] );
 			$index['logging'] = 'type_time';
 		}
@@ -374,7 +373,8 @@ class ApiQueryLogEvents extends ApiQueryBase {
 				)
 			),
 			'type' => array(
-				ApiBase::PARAM_TYPE => $wgLogTypes
+				ApiBase::PARAM_TYPE => $wgLogTypes,
+				ApiBase::PARAM_ISMULTI => true,
 			),
 			'action' => array(
 				ApiBase::PARAM_TYPE => array_keys( $wgLogActions )