jenkins-bot has submitted this change and it was merged.
Change subject: Select specific rows in EchoEventMapper::fetchByUserBundleHash()
......................................................................
Select specific rows in EchoEventMapper::fetchByUserBundleHash()
As needed by EchoEvent::loadFromRow().
Alternatively, just '*' as in MWEchoEmailBatch::getEvents().
Bug: T105890
Change-Id: I6c956738125658607d5e548efad4031c3298020f
---
M includes/mapper/EventMapper.php
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/mapper/EventMapper.php b/includes/mapper/EventMapper.php
index b9d3c32..cd7ad5b 100644
--- a/includes/mapper/EventMapper.php
+++ b/includes/mapper/EventMapper.php
@@ -78,7 +78,9 @@
if ( $type == 'web' ) {
$res = $dbr->select(
array( 'echo_notification', 'echo_event' ),
- array( 'echo_event.*' ),
+ array( 'event_agent_id', 'event_agent_ip',
'event_extra',
+ 'event_id', 'event_page_id',
'event_type', 'event_variant',
+ 'notification_timestamp' ),
array(
'notification_event=event_id',
'notification_user' => $user->getId(),
@@ -92,7 +94,9 @@
} else {
$res = $dbr->select(
array( 'echo_email_batch', 'echo_event' ),
- array( 'echo_event.*' ),
+ array( 'event_agent_id', 'event_agent_ip',
'event_extra',
+ 'event_id', 'event_page_id',
'event_type', 'event_variant',
+ 'notification_timestamp' ),
array(
'eeb_event_id=event_id',
'eeb_user_id' => $user->getId(),
--
To view, visit https://gerrit.wikimedia.org/r/233093
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c956738125658607d5e548efad4031c3298020f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Nemo bis <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
