summaryrefslogtreecommitdiff
path: root/program/steps/settings
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-11-24 07:53:00 +0000
committeralecpl <alec@alec.pl>2011-11-24 07:53:00 +0000
commit3ad2b1b4b0ac0fc7a6c7a5adaad9a0616b890daf (patch)
treeb4f9d8054a99ad4e20f22a0f7068036673187657 /program/steps/settings
parentc994e0e7cd9f593eb21ff80c7c1ddbeaf2a1b12a (diff)
- Applied fixes from trunk up to r5479
Diffstat (limited to 'program/steps/settings')
-rw-r--r--program/steps/settings/func.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 6ba524724..28da87628 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -437,14 +437,15 @@ function rcmail_user_prefs($current=null)
if (!isset($no_override['show_images'])) {
$field_id = 'rcmfd_show_images';
- $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id));
+ $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id,
+ 'disabled' => !$config['prefer_html']));
$input_show_images->add(rcube_label('never'), 0);
$input_show_images->add(rcube_label('fromknownsenders'), 1);
$input_show_images->add(rcube_label('always'), 2);
$blocks['main']['options']['show_images'] = array(
'title' => html::label($field_id, Q(rcube_label('showremoteimages'))),
- 'content' => $input_show_images->show($config['show_images']),
+ 'content' => $input_show_images->show($config['prefer_html'] ? $config['show_images'] : 0),
);
}