friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #8214 from nupplaphil/bug/7998-fata-itemccmail 

Fix ItemCCMail
This commit is contained in:
Hypolite Petovan 2020-02-01 14:13:05 -05:00 committed by GitHub
parent 346da998df 3a012d6fb7
commit 24abdaf64f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Object/EMail/ItemCCEMail.php
View File

@ -8,6 +8,7 @@ use Friendica\Content\Text\HTML;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Object\Email; use Friendica\Object\Email;
use Friendica\Protocol\Email as EmailProtocol;
/** /**
* Class for creating CC emails based on a received item * Class for creating CC emails based on a received item
@ -21,9 +22,9 @@ class ItemCCEMail extends Email
$disclaimer .= $l10n->t('You may visit them online at %s', $baseUrl . '/profile/' . $a->user['nickname']) . EOL; $disclaimer .= $l10n->t('You may visit them online at %s', $baseUrl . '/profile/' . $a->user['nickname']) . EOL;
$disclaimer .= $l10n->t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL; $disclaimer .= $l10n->t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . EOL;
if (!$item['title'] == '') { if (!$item['title'] == '') {
$subject = Email::encodeHeader($item['title'], 'UTF-8'); $subject = EmailProtocol::encodeHeader($item['title'], 'UTF-8');
} else { } else {
$subject = Email::encodeHeader('[Friendica]' . ' ' . $l10n->t('%s posted an update.', $a->user['username']), 'UTF-8'); $subject = EmailProtocol::encodeHeader('[Friendica]' . ' ' . $l10n->t('%s posted an update.', $a->user['username']), 'UTF-8');
} }
$link = '<a href="' . $baseUrl . '/profile/' . $a->user['nickname'] . '"><img src="' . $authorThumb . '" alt="' . $a->user['username'] . '" /></a><br /><br />'; $link = '<a href="' . $baseUrl . '/profile/' . $a->user['nickname'] . '"><img src="' . $authorThumb . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
$html = Item::prepareBody($item); $html = Item::prepareBody($item);