https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112547
Revision: 112547
Author: tstarling
Date: 2012-02-28 00:18:51 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
MFT r112546: Fix exception in list=recentchanges
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/api/ApiQueryRecentChanges.php
Property Changed:
----------------
branches/wmf/1.19wmf1/includes/api/ApiQueryRecentChanges.php
Modified: branches/wmf/1.19wmf1/includes/api/ApiQueryRecentChanges.php
===================================================================
--- branches/wmf/1.19wmf1/includes/api/ApiQueryRecentChanges.php
2012-02-28 00:14:33 UTC (rev 112546)
+++ branches/wmf/1.19wmf1/includes/api/ApiQueryRecentChanges.php
2012-02-28 00:18:51 UTC (rev 112547)
@@ -423,13 +423,14 @@
$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_action,
- $row->rc_log_type,
- $row->rc_timestamp
+ $logEntry->getParameters(),
+ $logEntry->getType(),
+ $logEntry->getSubtype(),
+ $logEntry->getTimestamp()
);
}
Property changes on:
branches/wmf/1.19wmf1/includes/api/ApiQueryRecentChanges.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/JSTesting/includes/api/ApiQueryRecentChanges.php:100352-107913
/branches/REL1_15/phase3/includes/api/ApiQueryRecentChanges.php:51646
/branches/REL1_16/phase3/includes/api/ApiQueryRecentChanges.php:63621-63636,69357
/branches/sqlite/includes/api/ApiQueryRecentChanges.php:58211-58321
/branches/wmf/1.16wmf4/includes/api/ApiQueryRecentChanges.php:69521
/branches/wmf/1.18wmf1/includes/api/ApiQueryRecentChanges.php:97789,111667
/branches/wmf-deployment/includes/api/ApiQueryRecentChanges.php:53381,59952
/trunk/phase3/includes/api/ApiQueryRecentChanges.php:111397,111673,112290,112374,112383,112397,112408,112474,112546
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
