From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 13 Apr 2015 17:09:04 +0000 (+0200)
Subject: Really use PROCESS instead of INCLUDE for custom fields, see bug 1137307
X-Git-Tag: release-5.1.1~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bcbc0faba0a0ed80eab653d3a696764686d202c;p=thirdparty%2Fbugzilla.git

Really use PROCESS instead of INCLUDE for custom fields, see bug 1137307
---

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index f9b2068927..c5cf88f043 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -982,7 +982,9 @@
 [%# *** Custom Fields *** %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
     <tr>
-      [% INCLUDE bug/field.html.tmpl value = bug.${field.name}
+      [%# Use PROCESS instead of INCLUDE, because extra_field_item is defined
+        # in the template and must be returned back. INCLUDE cannot do that. %]
+      [% PROCESS bug/field.html.tmpl value = bug.${field.name}
                                      editable = bug.check_can_change_field(field.name, 0, 1) %]
     </tr>
     [% IF extra_field_item %]