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

git-svn-id: svn://10.0.0.236/trunk@265929 18797224-902f-48f8-a5cc-f745e15eee43
2015-04-13 17:15:49 +00:00
parent 385b635470
commit 040e80ee4d
3 changed files with 5 additions and 3 deletions
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9382
+9383
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-d82782d4075bdcdbd94319c9ce525249e9b06113
+0bcbc0faba0a0ed80eab653d3a696764686d202c
--- a/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/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 %]