extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 01:22:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mail - avoid blank line at the top of merged emails

Browse Source
This commit is contained in:
nathangray 2019-07-26 11:48:39 -06:00
parent 7fa4c6a2ba
commit b6a04b8cfd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mail/inc/class.mail_compose.inc.php
View File

@ -1184,7 +1184,8 @@ class mail_compose
$content['body'] = $font_span.$before.($content['mimeType'] == 'html'?$sigText:$this->convertHTMLToText($sigText,true,true)).$inbetween.$content['body'];
}
}
else
// Skip this part if we're merging, it would add an extra line at the top
else if ($actionToProcess != 'merge')
{
$content['body'] = ($font_span?($isFirstLoad === "switchedplaintohtml"?$font_part:$font_span):/*($content['mimeType'] == 'html'?'&nbsp;':'')*/'').$content['body'].($isFirstLoad === "switchedplaintohtml"?"</span>":"");
}