summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-05-29 08:39:24 +0200
committerAleksander Machniak <alec@alec.pl>2014-05-29 08:39:24 +0200
commit3dbfb53f2b2f3e5c3befcf74f6580d2e2d307622 (patch)
treedb2edd21922e1291adef4f63115d3647a77f4cc8
parent5377753ccc0b0c6f715c9ce508a350e6f11f333d (diff)
Remove (was: ...) from message subject on reply (#1489375)
-rw-r--r--CHANGELOG1
-rw-r--r--program/steps/mail/compose.inc3
2 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b7f39a7b0..c9e3f386b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Remove (was: ...) from message subject on reply (#1489375)
- Update to TinyMCE 4.0 (#1489057)
- Enable autolink plugin in TinyMCE (#1488845)
- Support image operations with Imagick extension (#1489734)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 6a0139d72..c44ba434a 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -1457,6 +1457,9 @@ function rcmail_compose_subject($attrib)
$subject = $MESSAGE->subject;
else
$subject = 'Re: '.$MESSAGE->subject;
+
+ // replace (was: ...) (#1489375)
+ $subject = preg_replace('/\s*\([wW]as:[^\)]+\)\s*$/', '', $subject);
}
// create a forward-subject
else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {