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

Merge "EchoPlainTextEmailFormatter: correctly handle getPrimaryLink() returning false"

Browse source
This commit is contained in:
jenkins-bot 2022-07-19 20:03:13 +00:00 committed by Gerrit Code Review
parent 2b8ab8200e 7b2bed7cce
commit 1c812bddc0
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/formatters/EchoPlainTextEmailFormatter.php
View file

@ -14,10 +14,12 @@ class EchoPlainTextEmailFormatter extends EchoEventFormatter {
}
$primaryLink = $model->getPrimaryLinkWithMarkAsRead();
$primaryUrl = wfExpandUrl( $primaryLink['url'], PROTO_CANONICAL );
$colon = $this->msg( 'colon-separator' )->text();
$text .= "\n\n{$primaryLink['label']}$colon <$primaryUrl>";
if ( $primaryLink ) {
$primaryUrl = wfExpandUrl( $primaryLink['url'], PROTO_CANONICAL );
$text .= "\n\n{$primaryLink['label']}$colon <$primaryUrl>";
}
foreach ( array_filter( $model->getSecondaryLinks() ) as $secondaryLink ) {
$url = wfExpandUrl( $secondaryLink['url'], PROTO_CANONICAL );