From: Frédéric Buclin <LpSolit@gmail.com>
Date: Thu, 26 Jul 2012 01:31:07 +0000 (+0200)
Subject: Backout bug 768573 to fix bustage
X-Git-Tag: bugzilla-4.2.2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1a71191995c59f93f4e11906fcec41602e40178;p=thirdparty%2Fbugzilla.git

Backout bug 768573 to fix bustage
---

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 99f513168c..bdee838066 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -919,7 +919,7 @@
   [% USE Bugzilla %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
     <tr>
-      [% INCLUDE bug/field.html.tmpl value = bug.${field.name}
+      [% PROCESS bug/field.html.tmpl value = bug.${field.name}
                                      editable = bug.check_can_change_field(field.name, 0, 1)
                                      value_span = 2 %]
     </tr>
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index d79fe524a1..ac14e6dc0b 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -23,7 +23,7 @@
 
 [% PROCESS global/variables.none.tmpl %]
 <div id="status">
-  [% INCLUDE bug/field.html.tmpl
+  [% PROCESS bug/field.html.tmpl
       no_tds = 1
       field  = bug_fields.bug_status
       value  = bug.bug_status
@@ -38,7 +38,7 @@
   [% END %]
 
   <span id="resolution_settings">
-  [% INCLUDE bug/field.html.tmpl
+  [% PROCESS bug/field.html.tmpl
       no_tds = 1
       field  = bug_fields.resolution
       value  = bug.resolution
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 9f2734cf0e..7c2b5345e2 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -195,7 +195,7 @@
         [% field_counter = field_counter + 1 %]
         [%# Odd-numbered fields get an opening <tr> %]
         [% '<tr>' IF field_counter % 2 %]
-        [% INCLUDE bug/field.html.tmpl value=bug.${field.name} editable=0 %]
+        [% PROCESS bug/field.html.tmpl value=bug.${field.name} editable=0 %]
         [%# Even-numbered fields get a closing <tr> %]
         [% '</tr>' IF !(field_counter % 2) %]
         [% IF extra_field_item %]
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index a0adaea634..92e578e8f7 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -150,7 +150,7 @@
                value="[% dontchange FILTER html %]"
                size="6">
       </td>
-      [% INCLUDE bug/field.html.tmpl
+      [% PROCESS bug/field.html.tmpl 
           field = bug_fields.deadline, value = dontchange
           editable = 1, allow_dont_change = 1 %]
     </tr>
@@ -285,7 +285,7 @@
   [% bug = 0 %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
     <tr>
-      [% INCLUDE bug/field.html.tmpl value = dontchange
+      [% PROCESS bug/field.html.tmpl value = dontchange
                                      editable = 1
                                      allow_dont_change = 1 %]
     </tr>