summaryrefslogtreecommitdiff
path: root/program/steps/mail/sendmail.inc
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-09-20 08:18:54 +0200
committerAleksander Machniak <alec@alec.pl>2013-09-20 08:18:54 +0200
commitb334a01791689a16c8d6b10955df850b891ff40e (patch)
tree34173fc260a63a18ec56b75825cdc0925c84f594 /program/steps/mail/sendmail.inc
parent1bfd8ac27aa09421e77b629806dc9f667aa32cb6 (diff)
parentc1ff572e176dc930c52063e53364daa315d34666 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps/mail/sendmail.inc')
-rw-r--r--program/steps/mail/sendmail.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 779fb87cd..3f4475e46 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -473,8 +473,9 @@ $isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
if ($isHtml) {
- $font = rcube_fontdefs($RCMAIL->config->get('default_font'));
- $bstyle = $font && is_string($font) ? " style='font-family: $font'" : '';
+ $font_family = rcube_fontdefs($RCMAIL->config->get('default_font', 'Arial'));
+ $font_size = $RCMAIL->config->get('default_font_size');
+ $bstyle = ' style="font:' . $font_size . ' ' . $font_family . ';"';
// append doctype and html/body wrappers
$message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">' .