jenkins-bot has submitted this change and it was merged.
Change subject: Update to latest revision of Echo schema
......................................................................
Update to latest revision of Echo schema
This patch updates Echo to revision 6081131 of Schema:Echo, adding a 'rev_id'
field and the code to populate it. The patch also increments the logging
version identifier to 1.5.
Bug: 46045
Change-Id: I4ac1a25c306b0e0983a3490a29fe3dc4aa4bfc6f
---
M Echo.php
M includes/EventLogging.php
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.php b/Echo.php
index ced1f47..71d84c9 100644
--- a/Echo.php
+++ b/Echo.php
@@ -550,12 +550,12 @@
// Echo Configuration for EventLogging
$wgEchoConfig = array(
- 'version' => '1.4',
+ 'version' => '1.5',
// default all eventlogging off, overwrite them in site configuration
'eventlogging' => array (
'Echo' => array (
'enabled' => false,
- 'revision' => 5423520
+ 'revision' => 6081131
),
'EchoMail' => array (
'enabled' => false,
diff --git a/includes/EventLogging.php b/includes/EventLogging.php
index 88bb159..248cc9a 100644
--- a/includes/EventLogging.php
+++ b/includes/EventLogging.php
@@ -66,6 +66,11 @@
// whitelist valid delivery methods so it is always
valid
$data['deliveryMethod'] = 'web';
}
+ // Add revision ID if it exists
+ $rev = $event->getRevision();
+ if ( $rev ) {
+ $event['revisionId'] = $rev->getId();
+ }
self::actuallyLogTheEvent( 'Echo', $data );
}
--
To view, visit https://gerrit.wikimedia.org/r/90497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ac1a25c306b0e0983a3490a29fe3dc4aa4bfc6f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: DarTar <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
