summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-10-30 09:22:05 +0100
committerAleksander Machniak <alec@alec.pl>2014-10-30 09:22:05 +0100
commit968601f1f5e7366ddc8aa72d00d2f727d9eab572 (patch)
tree1c1b2dd4c4d64adba6efee136e08c32cdb9a1f8d /program/steps
parent5d8f8b59f3803d225ea77b974001f156113a1466 (diff)
Give higher priority to the 'subject' parameter from request or plugin
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/compose.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index e5c2fb108..751729cc5 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1452,6 +1452,9 @@ function rcmail_compose_subject($attrib)
if (isset($_POST['_subject'])) {
$subject = rcube_utils::get_input_value('_subject', rcube_utils::INPUT_POST, TRUE);
}
+ else if (!empty($COMPOSE['param']['subject'])) {
+ $subject = $COMPOSE['param']['subject'];
+ }
// create a reply-subject
else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
if (preg_match('/^re:/i', $MESSAGE->subject))
@@ -1473,9 +1476,6 @@ function rcmail_compose_subject($attrib)
else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) {
$subject = $MESSAGE->subject;
}
- else if (!empty($COMPOSE['param']['subject'])) {
- $subject = $COMPOSE['param']['subject'];
- }
$out = $form_start ? "$form_start\n" : '';
$out .= $textfield->show($subject);