* (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 1e7bf62..224b6eb 100644 (file)
--- 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 f69b7a9..234d47c 100644 (file)
--- 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 )