From c33e59e153d48934b1e3c5fd1303c0de3424e005 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 26 Jun 2012 19:00:46 +0000
Subject: [PATCH] Bug 768573: Templates must INCLUDE bug/field.html.tmpl
 instead of PROCESS'ing it r=glob a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@263985 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                             | 2 +-
 .../webtools/bugzilla/template/en/default/bug/edit.html.tmpl  | 2 +-
 .../webtools/bugzilla/template/en/default/bug/knob.html.tmpl  | 4 ++--
 .../bugzilla/template/en/default/bug/show-multiple.html.tmpl  | 2 +-
 .../bugzilla/template/en/default/list/edit-multiple.html.tmpl | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 23bfdec00ef..876ad99da03 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8270
\ No newline at end of file
+8271
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
index 9295e178ca3..acb0dc7336d 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/edit.html.tmpl
@@ -885,7 +885,7 @@
   [% USE Bugzilla %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
     <tr>
-      [% PROCESS bug/field.html.tmpl value = bug.${field.name}
+      [% INCLUDE 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/mozilla/webtools/bugzilla/template/en/default/bug/knob.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/knob.html.tmpl
index 70464720735..8413da9b0f8 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/knob.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/bug/knob.html.tmpl
@@ -7,7 +7,7 @@
   #%]
 
 <div id="status">
-  [% PROCESS bug/field.html.tmpl
+  [% INCLUDE 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">
-  [% PROCESS bug/field.html.tmpl
+  [% INCLUDE bug/field.html.tmpl
       no_tds = 1
       field  = bug_fields.resolution
       value  = bug.resolution
diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl
index 7207e8cf9dd..edc5c31874e 100644
--- a/mozilla/webtools/bugzilla/template/en/default/bug/show-multiple.html.tmpl
+++ b/mozilla/webtools/bugzilla/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 %]
-        [% PROCESS bug/field.html.tmpl value=bug.${field.name} editable=0 %]
+        [% INCLUDE 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/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
index 242346339ce..18179d20c7c 100644
--- a/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/list/edit-multiple.html.tmpl
@@ -134,7 +134,7 @@
                value="[% dontchange FILTER html %]"
                size="6">
       </td>
-      [% PROCESS bug/field.html.tmpl 
+      [% INCLUDE bug/field.html.tmpl
           field = bug_fields.deadline, value = dontchange
           editable = 1, allow_dont_change = 1 %]
     </tr>
@@ -269,7 +269,7 @@
   [% bug = 0 %]
   [% FOREACH field = Bugzilla.active_custom_fields %]
     <tr>
-      [% PROCESS bug/field.html.tmpl value = dontchange
+      [% INCLUDE bug/field.html.tmpl value = dontchange
                                      editable = 1
                                      allow_dont_change = 1 %]
     </tr>