From ec83e2da6eebb24331b30119ea8bb5cd49598620 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Thu, 2 Jun 2011 16:13:42 +0000 Subject: [PATCH] Revert r88722 (allow multiple values for letype): this won't play nice with query indexing --- RELEASE-NOTES-1.19 | 1 - includes/api/ApiQueryLogEvents.php | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 3508b3964a..5b40da3cfd 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -93,7 +93,6 @@ 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 * (bug 29221) Expose oldrevid in watchlist output === Languages updated in 1.19 === diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php index 837024426a..dd43f9b6f6 100644 --- a/includes/api/ApiQueryLogEvents.php +++ b/includes/api/ApiQueryLogEvents.php @@ -111,7 +111,8 @@ 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'; } @@ -370,8 +371,7 @@ class ApiQueryLogEvents extends ApiQueryBase { ) ), 'type' => array( - ApiBase::PARAM_TYPE => $wgLogTypes, - ApiBase::PARAM_ISMULTI => true, + ApiBase::PARAM_TYPE => $wgLogTypes ), 'action' => array( ApiBase::PARAM_TYPE => array_keys( $wgLogActions ) -- 2.20.1