keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix corrupt registration emails

Browse source 
- Use double quotes for line break-containing translation string
- Simplify HTML/plaintext email body conversion
This commit is contained in:
Hypolite Petovan 2018-06-14 23:42:08 -04:00
parent 6191fab4d7
commit 7469de29f1
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/enotify.php
View file

@ -366,7 +366,7 @@ function notification($params)
'[url='.$params['source_link'].']'.$params['source_name'].'[/url]' '[url='.$params['source_link'].']'.$params['source_name'].'[/url]'
); );
$body = L10n::t('Full Name: %1$s\nSite Location: %2$s\nLogin Name: %3$s ' . "\x28" . '%4$s' . "\x29", $body = L10n::t("Full Name: %s\nSite Location: %s\nLogin Name: %s (%s)",
$params['source_name'], $params['source_name'],
$siteurl, $params['source_mail'], $siteurl, $params['source_mail'],
$params['source_nick'] $params['source_nick']
@ -562,11 +562,8 @@ function notification($params)
} }
} }
// textversion keeps linebreaks $textversion = BBCode::toPlaintext($body);
$textversion = strip_tags(str_replace("<br>", "\n", html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n"], "\n", $htmlversion = BBCode::convert($body);
$body))),ENT_QUOTES, 'UTF-8')));
$htmlversion = html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"],
"<br />\n", $body))), ENT_QUOTES, 'UTF-8');
$datarray = []; $datarray = [];
$datarray['banner'] = $banner; $datarray['banner'] = $banner;