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 f9b2068927fc94a4ea37fa6e1b4817dcbcd351c4..c5cf88f04399c1ba864b5f8f0b1527fdcfb5bebe 100644 (file)
--- 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 %]