From 0d6cf02826af47cf18d62ec61bdfe7d92d40f127 Mon Sep 17 00:00:00 2001
From: Arthur Richards <awjrichards@users.mediawiki.org>
Date: Fri, 24 Feb 2012 23:39:42 +0000
Subject: [PATCH] Attempting to address bug 34653; It seems ApiQueryLogEvents
 has not kept up with changes to the Logging classes. I've changed some
 aspects of the ApiQueryLogEvents to use a DatabaseLogEntry object when
 extracting log row information and updated addLogParams to use this new
 scheme for handling parameters. I have not been able to sufficiently test
 this and I am still concerned about backwards compatibility with old
 parameter formats for older log records as well as parameter handling for the
 'rights' and 'block' log types.

---
 includes/api/ApiQueryLogEvents.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/includes/api/ApiQueryLogEvents.php b/includes/api/ApiQueryLogEvents.php
index adcc5cf108..4495b1e9b3 100644
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -198,25 +198,26 @@ class ApiQueryLogEvents extends ApiQueryBase {
 	 * @return array
 	 */
 	public static function addLogParams( $result, &$vals, $params, $type, $action, $ts ) {
-		$params = explode( "\n", $params );
 		switch ( $type ) {
 			case 'move':
-				if ( isset( $params[0] ) ) {
-					$title = Title::newFromText( $params[0] );
+				if ( isset( $params[ '4::target' ] ) ) {
+					$title = Title::newFromText( $params[ '4::target' ] );
 					if ( $title ) {
 						$vals2 = array();
 						ApiQueryBase::addTitleInfo( $vals2, $title, 'new_' );
 						$vals[$type] = $vals2;
 					}
 				}
-				if ( isset( $params[1] ) && $params[1] ) {
+				if ( isset( $params[ '5::noredir' ] ) && $params[ '5::noredir' ] ) {
 					$vals[$type]['suppressedredirect'] = '';
 				}
 				$params = null;
 				break;
 			case 'patrol':
 				$vals2 = array();
-				list( $vals2['cur'], $vals2['prev'], $vals2['auto'] ) = $params;
+				$vals2[ 'cur' ] = $params[ '4::curid' ];
+				$vals2[ 'prev' ] = $params[ '5::previd' ];
+				$vals2[ 'auto' ] = $params[ '6::auto' ];
 				$vals[$type] = $vals2;
 				$params = null;
 				break;
@@ -250,6 +251,7 @@ class ApiQueryLogEvents extends ApiQueryBase {
 	}
 
 	private function extractRowInfo( $row ) {
+		$logEntry = DatabaseLogEntry::newFromRow( $row );
 		$vals = array();
 
 		if ( $this->fld_ids ) {
@@ -281,10 +283,10 @@ class ApiQueryLogEvents extends ApiQueryBase {
 				self::addLogParams(
 					$this->getResult(),
 					$vals,
-					$row->log_params,
-					$row->log_type,
-					$row->log_action,
-					$row->log_timestamp
+					$logEntry->getParameters(),
+					$logEntry->getType(),
+					$logEntry->getSubtype(),
+					$logEntry->getTimestamp()
 				);
 			}
 		}
-- 
2.20.1