Bug 1143864: Replace |FILTER bug_link| in loops by direct calls to bug/link.html...

r=dkl a=sgreen

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 2eb850dd6b1d076c48f64547eeef9c1712f6633e..708032c447a3744710034f8ef514a0f97051bd7a 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -565,7 +565,7 @@
     <td class="field_value" colspan="2">
       <span id="duplicates">
         [% FOREACH dupe = bug.duplicates %]
-          [% dupe.id FILTER bug_link(dupe, use_alias => 1) FILTER none %][% " " %]
+          [% INCLUDE bug/link.html.tmpl bug = dupe, link_text = dupe.id, use_alias = 1 %][% " " %]
         [% END %]
       </span>
       (<a href="buglist.cgi?bug_id=[% bug.duplicate_ids.join(",") FILTER html %]">
@@ -1014,10 +1014,9 @@
                value="[% bug.${field.name}.join(', ') FILTER html %]">
       [% END %]
     </span>
-    
+
     [% FOREACH dep_bug = deps %]
-      [% dep_bug.id FILTER bug_link(dep_bug, use_alias => 1)
-                    FILTER none %][% " " %]
+      [% INCLUDE bug/link.html.tmpl bug = dep_bug, link_text = dep_bug.id, use_alias = 1 %][% " " %]
     [% END %]
     [% IF bug.check_can_change_field(field.name, 0, 1) %]
       <span id="[% field.name FILTER html %]_edit_container" 

diff --git a/template/en/default/bug/link.html.tmpl b/template/en/default/bug/link.html.tmpl
index b63093302c73782b304ade33ed38879fdefb2c7e..f1e8d041aec15586cb084cfec1231384793a661f 100644 (file)
--- a/template/en/default/bug/link.html.tmpl
+++ b/template/en/default/bug/link.html.tmpl
@@ -8,6 +8,8 @@
 
 [%# INTERFACE:
   #   bug: a Bugzilla::Bug object
+  #   user: the Bugzilla::User object to which this template is addressed.
+  #         If not set, the currently logged in user object is used.
   #   link_text: the text that we're highlighting.
   #   use_alias: boolean; If true, we display the bug's alias as the link
   #              text instead of link_text.

diff --git a/template/en/default/email/bugmail.html.tmpl b/template/en/default/email/bugmail.html.tmpl
index 9473a4459e8a24d54eefaaae5089c46d894aa599..fd348a6560e8d374acc18438b862bee184bff5da 100644 (file)
--- a/template/en/default/email/bugmail.html.tmpl
+++ b/template/en/default/email/bugmail.html.tmpl
@@ -20,9 +20,10 @@
       [% FOREACH comment = new_comments.reverse %]
         <div>
           [% IF 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 %]
         <pre>[% comment.body_full({ wrap => 1 }) FILTER quoteUrls(bug, comment, to_user) %]</pre>
@@ -75,14 +76,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 %]
@@ -106,7 +107,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 %]