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

Merge "Add ?markasread=NNN to primary links in emails too"

Browse source
This commit is contained in:
jenkins-bot 2016-06-13 11:52:03 +00:00 committed by Gerrit Code Review
parent 13769f7584 c09517492d
commit 954e83b0f8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/formatters/EchoHtmlEmailFormatter.php
View file

@ -16,7 +16,7 @@ class EchoHtmlEmailFormatter extends EchoEventFormatter {
$actions = array();
$primaryLink = $model->getPrimaryLink();
$primaryLink = $model->getPrimaryLinkWithMarkAsRead();
if ( $primaryLink ) {
$actions[] = $this->renderLink( $primaryLink, self::PRIMARY_LINK_STYLE );
}

2
includes/formatters/EchoPlainTextEmailFormatter.php
View file

@ -14,7 +14,7 @@ class EchoPlainTextEmailFormatter extends EchoEventFormatter {
$text .= EchoDiscussionParser::htmlToText( $bodyMsg->parse() );
}
$primaryLink = $model->getPrimaryLink();
$primaryLink = $model->getPrimaryLinkWithMarkAsRead();
$primaryUrl = wfExpandUrl( $primaryLink['url'], PROTO_CANONICAL );
$colon = $this->msg( 'colon-separator' )->text();