Bug 556429: Stop sending bugmail from inside the template

r=LpSolit, a=LpSolit

4 files changed, 8 insertions, 23 deletions

diff --git a/template/en/default/bug/create/created.html.tmpl b/template/en/default/bug/create/created.html.tmpl
index 3dfb3534a..d9eaccbbf 100644
--- a/template/en/default/bug/create/created.html.tmpl
+++ b/template/en/default/bug/create/created.html.tmpl
@@ -24,8 +24,6 @@
   #     type: string; type of change for this bug, either 'created' if this bug
   #         was created or 'dep' if it was added as a dependent/blocker
   #     id: integer; the ID of the bug
-  # mailrecipients: hash; contains the BugMail recipients, for details on
-  #     this contents, see template bug/process/bugmail.html.tmpl
   # bug: object; Bugzilla::Bug object of the bug that was created (used in
   #     template bug/edit.html.tmpl
   #%]
@@ -44,8 +42,7 @@
   [% PROCESS bug/process/results.html.tmpl
      type = item.type
      id = item.id
-     mail = item.mail
-     mailrecipients = mailrecipients
+     sent_bugmail = item
    %]
 [% END %]
 
diff --git a/template/en/default/bug/process/bugmail.html.tmpl b/template/en/default/bug/process/bugmail.html.tmpl
index 71299225b..b0132a2fe 100644
--- a/template/en/default/bug/process/bugmail.html.tmpl
+++ b/template/en/default/bug/process/bugmail.html.tmpl
@@ -20,34 +20,21 @@
   #%]
 
 [%# INTERFACE:
-  # mailing_bugid: string. ID of the bug this mail is concerning.
-  # mailrecipients: hash. People involved in this change. Hash has up to five
-  #                elements:
-  #                changer: string. The login name of the user who made the
-  #                change.
-  #
-  #                For bug changes where people need to be notified:
-  #                 owner: string. The login name of the bug assignee.
-  #                 reporter: string. The login name of the bug reporter.
-  #                 qacontact: string. The login name of the bug's QA contact.
-  #                  Optional.
-  #                 cc: list of strings. The login names of those on the CC
-  #                  list.
+  # mailing_bugid: The bug ID that email is being sent for.
+  # sent_bugmail: The results of Bugzilla::BugMail::Send().
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% mail = SendBugMail(mailing_bugid, mailrecipients) %]
-
 <dl>
 [% PROCESS emails
    description = "Email sent to"
-   names = mail.sent
+   names = sent_bugmail.sent
 %]
 
 [% PROCESS emails
    description = "Excluding"
-   names = mail.excluded
+   names = sent_bugmail.excluded
 %]
 </dl>
 
diff --git a/template/en/default/bug/process/results.html.tmpl b/template/en/default/bug/process/results.html.tmpl
index 7c1af42af..c62a7a597 100644
--- a/template/en/default/bug/process/results.html.tmpl
+++ b/template/en/default/bug/process/results.html.tmpl
@@ -24,8 +24,6 @@
   # type: string; the type of change/check that was made: "bug" when a bug
   #   is changed, "dupe" when a duplication notation is added to a bug,
   #   and "dep" when a bug is checked for changes to its dependencies.
-  #
-  # mailrecipients: hash; BugMail recipient params. Optional.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index b22a47160..6a9d75cd7 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -523,6 +523,9 @@
 <h2 id="v36_code_changes">Code Changes Which May Affect Customizations</h2>
 
 <ul>
+  <li>There is no longer a SendBugMail method in the templates, and bugmail
+    is no longer sent by processing a template. Instead, it is sent
+    by using <kbd>Bugzilla::BugMail::Send</kbd>.</li>
   <li>Comments are now represented as a
     <a href="[% docs_urlbase FILTER html %]api/Bugzilla/Comment.html">Bugzilla::Comment</a>
     object instead of just being hashes.</li>