summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-09-16 20:01:10 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-09-16 20:01:10 +0200
commitc1ff572e176dc930c52063e53364daa315d34666 (patch)
treed157276c59c2b3db569004280b139e15bd29bd40 /program/steps
parent0201298cd8f767389789f7c35897985d4475836a (diff)
Touch new default font size settings: simplified + codestyle + updated changelog
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/sendmail.inc5
-rw-r--r--program/steps/settings/func.inc4
2 files changed, 4 insertions, 5 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 8fe149611..3f4475e46 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -473,10 +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'));
- $font = $font && is_string($font) ? ' '.$font : NULL;
+ $font_family = rcube_fontdefs($RCMAIL->config->get('default_font', 'Arial'));
$font_size = $RCMAIL->config->get('default_font_size');
- $bstyle = " style='font: ".$font_size.$font.";'";
+ $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">' .
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index b492c9644..53c98eddf 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -864,8 +864,8 @@ function rcmail_user_prefs($current = null)
$blocks['main']['options']['default_font'] = array(
'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
- 'content' => $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1)).
- $select_default_font->show($RCMAIL->config->get('default_font', 1))
+ 'content' => $select_default_font->show($RCMAIL->config->get('default_font', 1)) .
+ $select_default_font_size->show($RCMAIL->config->get('default_font_size', 1))
);
}
break;