From cb8ec961ded401de227b023a7ff813330d0f3a08 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sun, 5 Apr 2015 21:26:27 +0200
Subject: Bug 1143864: Replace |FILTER bug_link| in loops by direct calls to
 bug/link.html.tmpl to improve performance r=dkl a=sgreen

---
 template/en/default/email/bugmail.html.tmpl  | 23 ++++++++++++-----------
 template/en/default/email/flagmail.html.tmpl |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'template/en/default/email')

diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index c3b8b357f..1a74db4dc 100644
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -22,9 +22,10 @@
         <div>
           [% IF comment.count %]
             [% comment_anchor = "#c$comment.count" %]
-            <b>[% "Comment # ${comment.count}" FILTER bug_link(bug,
-              {comment_num => comment.count, full_url => 1, user => to_user}) FILTER none %]
-              on [% "$terms.bug $bug.id" FILTER bug_link(bug, { full_url => 1, user => to_user }) FILTER none %]
+            <b>[% INCLUDE bug/link.html.tmpl bug = bug, link_text = "Comment # ${comment.count}",
+                                             comment_num = comment.count, full_url = 1, user = to_user %]
+              on [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.bug $bug.id",
+                                               full_url = 1, user = to_user %]
               from [% INCLUDE global/user.html.tmpl user = to_user, who = comment.author %]</b>
           [% END %]
         [% comment_div = comment.is_markdown ? "div" : "pre" %]
@@ -86,14 +87,14 @@
           [% SET in_table = 0 %]
         [% END %]
         [% IF change.blocker %]
-              [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
-              depends on
-              [%+ "${terms.bug} ${change.blocker.id}"
-                  FILTER bug_link(change.blocker, {full_url => 1, user => to_user}) FILTER none %],
-              which changed state.
+          [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.Bug $bug.id", full_url = 1, user = to_user %]
+          depends on
+          [%+ INCLUDE bug/link.html.tmpl bug = change.blocker, link_text = "$terms.bug $change.blocker.id",
+                                         full_url = 1, user = to_user %],
+          which changed state.
         [% ELSE %]
-              [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed
-              [%+ "${terms.bug} ${bug.id}" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
+          [% INCLUDE global/user.html.tmpl user = to_user, who = change.who %] changed
+          [%+ INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.bug $bug.id", full_url = 1, user = to_user %]
         [% END %]
           <br>
           [% IF in_table == 0 %]
@@ -117,7 +118,7 @@
           <th>[% field_label FILTER html %]</th>
           <td>
             [% IF change.field_name == "bug_id" %]
-              [% new_value FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]
+              [% INCLUDE bug/link.html.tmpl bug = bug, link_text = new_value, full_url = 1, user = to_user %]
             [% ELSE %]
               [% new_value FILTER html %]
             [% END %]
diff --git a/template/en/default/email/flagmail.html.tmpl b/template/en/default/email/flagmail.html.tmpl
index d0b61fbbc..1c8fc0731 100644
--- a/template/en/default/email/flagmail.html.tmpl
+++ b/template/en/default/email/flagmail.html.tmpl
@@ -47,7 +47,7 @@
     </p>
 
     <p>
-      [% "$terms.Bug $bug.bug_id" FILTER bug_link(bug, {full_url => 1, user => to_user}) FILTER none %]:
+      [% INCLUDE bug/link.html.tmpl bug = bug, link_text = "$terms.Bug $bug.id", full_url = 1, user = to_user %]:
       [%= bug.short_desc FILTER html %]
     </p>
 
-- 
cgit v1.2.3-24-g4f1b