mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
wrap <br/> in <p> (<p><br/></p>), so TinyMCE does not mess it up, if we have no signature separator
(wrap the first comment, wrapping the signature, in a <p> and remove the <br/>)
This commit is contained in:
parent
76fee91a50
commit
967eca4975
@ -1184,7 +1184,7 @@ class mail_compose
|
|||||||
}
|
}
|
||||||
if ($content['mimeType'] === 'html')
|
if ($content['mimeType'] === 'html')
|
||||||
{
|
{
|
||||||
$start = "<br/>\n";
|
$start = "<p><br/></p>\n";
|
||||||
$before = $disableRuler ? '' : '<hr class="ruler" style="border:1px dotted silver; width:100%;">';
|
$before = $disableRuler ? '' : '<hr class="ruler" style="border:1px dotted silver; width:100%;">';
|
||||||
$inbetween = '';
|
$inbetween = '';
|
||||||
}
|
}
|
||||||
@ -2583,7 +2583,7 @@ class mail_compose
|
|||||||
($disableRuler ? "\r\n" : "\r\n-- \r\n").
|
($disableRuler ? "\r\n" : "\r\n-- \r\n").
|
||||||
$this->convertHTMLToText($signature, true, true));
|
$this->convertHTMLToText($signature, true, true));
|
||||||
|
|
||||||
$body .= ($disableRuler ?'<br>':'<hr style="border:1px dotted silver; width:90%;">').$signature;
|
$body .= ($disableRuler ?'<p><br/></p>':'<hr style="border:1px dotted silver; width:90%;">').$signature;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user