diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-02-25 10:33:17 +0100 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-02-25 10:33:17 +0100 |
| commit | 6982af2deb77df81743503147bd430895ba55219 (patch) | |
| tree | 049f5c5b870a9703b5012dacd7001ec2cd0896ee | |
| parent | f4cfef3444af5f2212f320561e54a12628815f50 (diff) | |
| download | bugzilla-6982af2deb77df81743503147bd430895ba55219.tar.gz bugzilla-6982af2deb77df81743503147bd430895ba55219.tar.xz | |
Bug 844724: updates for the push extension
| -rw-r--r-- | Bugzilla/BugMail.pm | 4 | ||||
| -rw-r--r-- | extensions/BMO/Extension.pm | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 696db5ceb..ea79947b8 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -294,7 +294,9 @@ sub Send { # happen after the bugmail_recipients hook. if ($user->email_enabled && $dep_ok && ($user->login !~ /bugs$/) && - ($user->login !~ /\.tld$/)) + # sync-1@bugzilla.tld here is a temporary hack, see bug 844724 + ($user->login eq 'sync-1@bugzilla.tld' || $user->login !~ /\.tld$/)) + { # OK, OK, if we must. Email the user. diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm index a887582c3..7909d732d 100644 --- a/extensions/BMO/Extension.pm +++ b/extensions/BMO/Extension.pm @@ -847,6 +847,11 @@ sub mailer_before_send { _log_sent_email($email); + # see bug 844724 + if ($email->header('to') && $email->header('to') eq 'sync-1@bugzilla.tld') { + $email->header_set('to', 'mei.kong@tcl.com'); + } + # Add X-Bugzilla-Tracking header if ($email->header('X-Bugzilla-ID')) { my $bug_id = $email->header('X-Bugzilla-ID'); |