From 6d3e53d2b8a24e594f7c7fe93a0632a8171cdab3 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 26 May 2012 04:32:10 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/steps/settings/func.inc | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index da60fea..7b5534e 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -617,6 +617,18 @@
);
}
+ if (!isset($no_override['forward_attachment'])) {
+ $field_id = 'rcmfd_forward_attachment';
+ $select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));
+ $select->add(rcube_label('inline'), 0);
+ $select->add(rcube_label('asattachment'), 1);
+
+ $blocks['main']['options']['forward_attachment'] = array(
+ 'title' => html::label($field_id, Q(rcube_label('forwardmode'))),
+ 'content' => $select->show(intval($config['forward_attachment'])),
+ );
+ }
+
if (!isset($no_override['default_font'])) {
$field_id = 'rcmfd_default_font';
$fonts = rcube_fontdefs();
--
Gitblit v1.9.1