summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-06-30 15:53:44 +0200
committerByron Jones <glob@mozilla.com>2014-06-30 15:53:44 +0200
commite2b27e46426ed1d32cc521229d920583b647fd7c (patch)
treeb1017afa260dc759f9ab0867e724b999cf82c01d /extensions
parentc5697156641e627144069b2732fc9cf641b4a7a2 (diff)
downloadbugzilla-e2b27e46426ed1d32cc521229d920583b647fd7c.tar.gz
bugzilla-e2b27e46426ed1d32cc521229d920583b647fd7c.tar.xz
Bug 1030747: Recent changes to secure bugmail subject lines break GMail threading
Diffstat (limited to 'extensions')
-rw-r--r--extensions/SecureMail/Extension.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/extensions/SecureMail/Extension.pm b/extensions/SecureMail/Extension.pm
index 5c697e8db..687112955 100644
--- a/extensions/SecureMail/Extension.pm
+++ b/extensions/SecureMail/Extension.pm
@@ -552,6 +552,8 @@ sub _make_secure {
my $new = $add_new ? ' New:' : '';
my $product = $email->header('X-Bugzilla-Product');
my $component = $email->header('X-Bugzilla-Component');
+ # Note: the $bug_id is required within the parentheses in order to keep
+ # gmail's threading algorithm happy.
$subject =~ s/($bug_id\])\s+(.*)$/$1$new (Secure bug $bug_id in $product :: $component)/;
$email->header_set('Subject', $subject);
}