Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-27 11:10:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix various notices

Browse source
This commit is contained in:
Hypolite Petovan 2018-12-15 04:32:47 -05:00
parent 607f7daf51
commit b6e1571b1e
7 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Protocol/Email.php
View file

@ -117,7 +117,7 @@ class Email
return $ret;
}
if (!$struc->parts) {
if (empty($struc->parts)) {
$ret['body'] = self::messageGetPart($mbox, $uid, $struc, 0, 'html');
$html = $ret['body'];
@ -482,13 +482,11 @@ class Email
'[\r\n]\s*-----BEGIN PGP SIGNATURE-----\s*[\r\n].*'.
'[\r\n]\s*-----END PGP SIGNATURE-----(.*)/is';
preg_match($pattern, $message, $result);
if (preg_match($pattern, $message, $result)) {
$cleaned = trim($result[1].$result[2].$result[3]);
$cleaned = trim($result[1].$result[2].$result[3]);
$cleaned = str_replace(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned);
if ($cleaned == '') {
$cleaned = str_replace(["\n- --\n", "\n- -"], ["\n-- \n", "\n-"], $cleaned);
} else {
$cleaned = $message;
}