From 2e617ed0f590e428991f4bdbdb1acc2da468fe98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Sun, 29 Jul 2012 00:19:56 +0200
Subject: Backout bug 768573

---
 template/en/default/bug/edit.html.tmpl           | 2 +-
 template/en/default/bug/knob.html.tmpl           | 4 ++--
 template/en/default/bug/show-multiple.html.tmpl  | 2 +-
 template/en/default/list/edit-multiple.html.tmpl | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'template')

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index cecf16784..cc2ce8078 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -885,7 +885,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 8413da9b0..704647207 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 <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
@@ -22,7 +22,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 edc5c3187..7207e8cf9 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -176,7 +176,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 c4a7ef964..962f36f5a 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -136,7 +136,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>
@@ -273,7 +273,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>
-- 
cgit v1.2.1