Remove (was: ...) from message subject on reply (#1489375)

11 years ago · 3dbfb53f2b
parent 5377753ccc
commit 3dbfb53f2b
2 changed files with 4 additions and 0 deletions
--- a/1
+++ b/1
@ -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)
--- 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) {