From: grunny <mwgrunny@gmail.com>
Date: Sat, 7 Apr 2012 09:01:41 +0000 (+1000)
Subject: (bug 35723) Fix exception in API list=watchlist
X-Git-Tag: 1.31.0-rc.0~23991^2
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=6ce38ed838c88918233c45ab6d8ac84a1520a290;p=lhc%2Fweb%2Fwiklou.git

(bug 35723) Fix exception in API list=watchlist

Applying Tim's change to list=recentchanges from commit bf1e9d7
Updates it for the new log system

Change-Id: Ifed6baba628b30f3189e64c6b7e0b278ee0e8e9a
---

diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index ea56fcd973..77f6ce9dc4 100644
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -296,13 +296,14 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 			$vals['logid'] = intval( $row->rc_logid );
 			$vals['logtype'] = $row->rc_log_type;
 			$vals['logaction'] = $row->rc_log_action;
+			$logEntry = DatabaseLogEntry::newFromRow( (array)$row );
 			ApiQueryLogEvents::addLogParams(
 				$this->getResult(),
 				$vals,
-				$row->rc_params,
-				$row->rc_log_type,
-				$row->rc_log_action,
-				$row->rc_timestamp
+				$logEntry->getParameters(),
+				$logEntry->getType(),
+				$logEntry->getSubtype(),
+				$logEntry->getTimestamp()
 			);
 		}