From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 31 Jul 2012 16:41:44 +0000 (+0200)
Subject: Bug 768573: bug/field.html.tmpl overrides the 'hidden' variable, causing some field... 
X-Git-Tag: bugzilla-4.3.3~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3abb85013982986b77f540b3f47d55f3578fd90;p=thirdparty%2Fbugzilla.git

Bug 768573: bug/field.html.tmpl overrides the 'hidden' variable, causing some field labels to be hidden by accident
r=glob a=LpSolit
---

diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 1f0ea175ac..88a5adba8e 100644
--- 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 %]