Bug 768573: bug/field.html.tmpl overrides the 'hidden' variable, causing some field...

r=glob a=LpSolit

diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 1f0ea175acebe50a5d4028f131bd60fd78e2e7d7..88a5adba8ef7f0f24c24bca887e42d3f2a863ff5 100644 (file)
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -21,14 +21,14 @@
   #                   with default field values being displayed on a page.
   #%]
 
-[% SET hidden = 0 %]
-[% IF bug AND !field.is_visible_on_bug(bug) %]
-  [% SET hidden = 1 %]
-[% END %]
-
 [% IF NOT no_tds %]
-  [% PROCESS "bug/field-label.html.tmpl" %]
-  <td class="field_value [% ' bz_hidden_field' IF hidden %]"
+  [% field_hidden = 0 %]
+  [% IF bug AND !field.is_visible_on_bug(bug) %]
+    [% field_hidden = 1 %]
+  [% END %]
+
+  [% INCLUDE "bug/field-label.html.tmpl" hidden = field_hidden %]
+  <td class="field_value [% ' bz_hidden_field' IF field_hidden %]"
       id="field_container_[% field.name FILTER html %]" 
       [% " colspan=\"$value_span\"" FILTER none IF value_span %]>
 [% END %]