wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-28 01:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix UserMerge integration for use with table prefix"

Browse source
This commit is contained in:
jenkins-bot 2019-03-04 07:55:07 +00:00 committed by Gerrit Code Review
parent ebdc8df419 8ce0cc171d
commit 91bc7dcd81
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/EchoHooks.php
View file

@ -1405,7 +1405,7 @@ class EchoHooks {
$thankYouIds = []; $thankYouIds = [];
$thankYouRows = $dbw->select( $thankYouRows = $dbw->select(
[ 'echo_notification', 'echo_event' ], [ 'echo_notification', 'echo_event' ],
'echo_event.*', EchoEvent::selectFields(),
[ [
'notification_user' => $newUser->getId(), 'notification_user' => $newUser->getId(),
'notification_event = event_id', 'notification_event = event_id',

21
includes/model/Event.php
View file

@ -723,4 +723,25 @@ class EchoEvent extends EchoAbstractEntity implements Bundleable {
public function getSortingKey() { public function getSortingKey() {
return $this->getTimestamp(); return $this->getTimestamp();
} }
/**
* Return the list of fields that should be selected to create
* a new event with EchoEvent::newFromRow
* @return string[]
*/
public static function selectFields() {
return [
'event_id',
'event_type',
'event_variant',
'event_agent_id',
'event_agent_ip',
'event_page_namespace',
'event_page_title',
'event_extra',
'event_page_id',
'event_deleted',
];
}
} }