From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Mon, 18 Jun 2012 14:46:47 +0000 (+0000)
Subject: Fix regression in API log events (bug 35635)
X-Git-Tag: 1.31.0-rc.0~22963^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=357c9be1b13ea2729fa0a79a58d7e05daeb0f503;hp=b2fa84bed7dabce6e25ad807dc0304199492b6df;p=lhc%2Fweb%2Fwiklou.git

Fix regression in API log events (bug 35635)

Patch set 2: Fixed minor typo (redier -> redir)

Change-Id: Ia38075db1e687f33b77c733994e0f19815444a78
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c2606ce826..067062d7d9 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5261,10 +5261,12 @@ $wgLogActions = array(
  * @see LogFormatter
  */
 $wgLogActionsHandlers = array(
-	// move, move_redir
-	'move/*'            => 'MoveLogFormatter',
-	// delete, restore, revision, event
-	'delete/*'          => 'DeleteLogFormatter',
+	'move/move'         => 'MoveLogFormatter',
+	'move/move_redir'  => 'MoveLogFormatter',
+	'delete/delete'     => 'DeleteLogFormatter',
+	'delete/restore'    => 'DeleteLogFormatter',
+	'delete/revision'   => 'DeleteLogFormatter',
+	'delete/event'      => 'DeleteLogFormatter',
 	'suppress/revision' => 'DeleteLogFormatter',
 	'suppress/event'    => 'DeleteLogFormatter',
 	'suppress/delete'   => 'DeleteLogFormatter',
diff --git a/includes/Setup.php b/includes/Setup.php
index 18a880e560..dedfca9157 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -365,8 +365,10 @@ if ( $wgNewUserLog ) {
 	$wgLogTypes[]                        = 'newusers';
 	$wgLogNames['newusers']              = 'newuserlogpage';
 	$wgLogHeaders['newusers']            = 'newuserlogpagetext';
-	# newusers, create, create2, autocreate
-	$wgLogActionsHandlers['newusers/*']  = 'NewUsersLogFormatter';
+	$wgLogActionsHandlers['newusers/newusers'] = 'NewUsersLogFormatter';
+	$wgLogActionsHandlers['newusers/create'] = 'NewUsersLogFormatter';
+	$wgLogActionsHandlers['newusers/create2'] = 'NewUsersLogFormatter';
+	$wgLogActionsHandlers['newusers/autocreate'] = 'NewUsersLogFormatter';
 }
 
 if ( $wgCookieSecure === 'detect' ) {
diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index bb4b429a36..3aadaa594c 100644
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -367,7 +367,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
 	}
 
 	public function getAllowedParams() {
-		global $wgLogTypes, $wgLogActions;
+		global $wgLogTypes, $wgLogActions, $wgLogActionsHandlers;
 		return array(
 			'prop' => array(
 				ApiBase::PARAM_ISMULTI => true,
@@ -389,7 +389,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
 				ApiBase::PARAM_TYPE => $wgLogTypes
 			),
 			'action' => array(
-				ApiBase::PARAM_TYPE => array_keys( $wgLogActions )
+				ApiBase::PARAM_TYPE => array_keys( array_merge( $wgLogActions, $wgLogActionsHandlers ) )
 			),
 			'start' => array(
 				ApiBase::PARAM_TYPE => 'timestamp'