diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-09-21 11:24:16 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-09-21 11:24:16 +0200 |
| commit | f7b2bfba092213af2f7101b18b96e957cbe0b217 (patch) | |
| tree | 294af8a00516d41fe4c0989795a9e5d2539c8395 /program/steps/settings | |
| parent | a149d566fca224e503b7676337486ec2670e6cca (diff) | |
Bring back possibility to unset default font family and font size
Fix style attribute quoting when font-family contains double quotes
SOme code improvements
Diffstat (limited to 'program/steps/settings')
| -rw-r--r-- | 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 53c98eddf..f1170178d 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -839,7 +839,7 @@ function rcmail_user_prefs($current = null) ); } - 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 @@ function rcmail_user_prefs($current = null) $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 @@ function rcmail_user_prefs($current = null) // 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) { |