From 07795ba12413ff75e15cd17d89a12ac6f49f74e9 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 23 May 2013 12:47:23 -0400
Subject: [PATCH] Fix invalid option selected in default_font selector when font is unset (#1489112)
---
program/steps/settings/func.inc | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 860f36c..ce86b1c 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -664,14 +664,15 @@
}
if (!isset($no_override['default_font'])) {
- $field_id = 'rcmfd_default_font';
- $fonts = rcube_fontdefs();
- $default_font = $config['default_font'] ? $config['default_font'] : 'Verdana';
+ $field_id = 'rcmfd_default_font';
+ $fonts = rcube_fontdefs();
+ $selected = $config['default_font'];
$select = '<select name="_default_font" id="'.$field_id.'">';
+ $select .= '<option value=""' . (!$selected ? ' selected="selected"' : '') . '>---</option>';
foreach ($fonts as $fname => $font)
$select .= '<option value="'.$fname.'"'
- . ($fname == $default_font ? ' selected="selected"' : '')
+ . ($fname == $selected ? ' selected="selected"' : '')
. ' style=\'font-family: ' . $font . '\'>'
. Q($fname) . '</option>';
$select .= '</select>';
--
Gitblit v1.9.1