diff options
| author | alecpl <alec@alec.pl> | 2011-11-24 07:53:00 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2011-11-24 07:53:00 +0000 |
| commit | 3ad2b1b4b0ac0fc7a6c7a5adaad9a0616b890daf (patch) | |
| tree | b4f9d8054a99ad4e20f22a0f7068036673187657 /program/steps | |
| parent | c994e0e7cd9f593eb21ff80c7c1ddbeaf2a1b12a (diff) | |
- Applied fixes from trunk up to r5479
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/get.inc | 2 | ||||
| -rw-r--r-- | program/steps/settings/func.inc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index d4dcd0a84..828f8debc 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.inc @@ -22,7 +22,7 @@ // show loading page if (!empty($_GET['_preload'])) { - $url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']); + $url = preg_replace('/[&?]+_preload=1/', '', $_SERVER['REQUEST_URI']); $message = rcube_label('loadingdata'); header('Content-Type: text/html; charset=' . RCMAIL_CHARSET); 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), ); } |