summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-03-26 19:36:47 +0100
committerAleksander Machniak <alec@alec.pl>2013-03-26 19:38:07 +0100
commit099d2b9fd4af3c7e7f1568af3c01c0b2e52cd9c3 (patch)
tree61ef7c58e07f18dc1c1977938b3533e4401a43ab /program/steps/mail
parent321d8b06fb32d6fa6bc991f7fbb95d63bdb70390 (diff)
Remove sig_above configuration option, use reply_mode only (#1489001)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/compose.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index a39642206..5346959bd 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -139,7 +139,6 @@ if (!empty($CONFIG['drafts_mbox'])) {
}
// set current mailbox in client environment
$OUTPUT->set_env('mailbox', $RCMAIL->storage->get_folder());
-$OUTPUT->set_env('sig_above', $RCMAIL->config->get('sig_above', false));
$OUTPUT->set_env('top_posting', intval($RCMAIL->config->get('reply_mode')) > 0);
$OUTPUT->set_env('recipients_separator', trim($RCMAIL->config->get('recipients_separator', ',')));
@@ -453,7 +452,7 @@ function rcmail_compose_header_from($attrib)
if (count($MESSAGE->identities))
{
$a_signatures = array();
- $separator = $RCMAIL->config->get('sig_above')
+ $separator = intval($RCMAIL->config->get('reply_mode')) > 0
&& ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD) ? '---' : '-- ';
$field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)";