From f7b2bfba092213af2f7101b18b96e957cbe0b217 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 21 Sep 2013 05:24:16 -0400
Subject: [PATCH] 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/settings/func.inc | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 53c98ed..f117017 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -839,7 +839,7 @@
);
}
- if (!isset($no_override['default_font'])) {
+ if (!isset($no_override['default_font']) || !isset($no_override['default_font_size'])) {
if (!$current) {
continue 2;
}
@@ -848,7 +848,7 @@
$field_id = 'rcmfd_default_font_size';
$select_default_font_size = new html_select(array('name' => '_default_font_size', 'id' => $field_id));
- $fontsizes = array('8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
+ $fontsizes = array('', '8pt', '10pt', '12pt', '14pt', '18pt', '24pt', '36pt');
foreach ($fontsizes as $size) {
$select_default_font_size->add($size, $size);
}
@@ -856,6 +856,7 @@
// Default font
$field_id = 'rcmfd_default_font';
$select_default_font = new html_select(array('name' => '_default_font', 'id' => $field_id));
+ $select_default_font->add('', '');
$fonts = rcube_fontdefs();
foreach ($fonts as $fname => $font) {
--
Gitblit v1.9.1