From f7b2bfba092213af2f7101b18b96e957cbe0b217 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 21 Sep 2013 11:24:16 +0200 Subject: Bring back possibility to unset default font family and font size Fix style attribute quoting when font-family contains double quotes SOme code improvements --- program/steps/mail/compose.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'program/steps/mail/compose.inc') diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 30c9f79fb..b62f9bf5a 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -149,7 +149,9 @@ if ($font && !is_array($font)) { } // default font size for HTML editor -$OUTPUT->set_env('default_font_size', $RCMAIL->config->get('default_font_size')); +if ($font_size = $RCMAIL->config->get('default_font_size')) { + $OUTPUT->set_env('default_font_size', $font_size); +} // get reference message and set compose mode if ($msg_uid = $COMPOSE['param']['draft_uid']) { -- cgit v1.2.3