Bug 238876: remove %FORM from process_bug.cgi - Patch by Teemu Mannermaa <wicked@etlicon.fi> r=LpSolit a=justdave

3 files changed, 11 insertions, 9 deletions

diff --git a/template/en/default/bug/process/confirm-duplicate.html.tmpl b/template/en/default/bug/process/confirm-duplicate.html.tmpl
index 7fd72a2d0..815b3d43c 100644
--- a/template/en/default/bug/process/confirm-duplicate.html.tmpl
+++ b/template/en/default/bug/process/confirm-duplicate.html.tmpl
@@ -20,8 +20,6 @@
   #%]
 
 [%# INTERFACE:
-  # form: hash; the form values submitted to the script
-  # mform: hash; the form multi-values submitted to the script
   # original_bug_id: number; the bug number for the bug
   #   against which a bug is being duped
   # duplicate_bug_id: number; the bug number for the bug
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index 491e5b269..2c2427616 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -20,8 +20,6 @@
   #%]
 
 [%# INTERFACE:
-  # form: hash; the form values submitted to the script
-  # mform: hash; the form multi-values submitted to the script
   # operations: array; bug activity since the user last displayed the bug form,
   #   used by bug/activity/table.html.tmpl to display recent changes that will
   #   be overwritten if the user submits these changes.  See that template
@@ -34,6 +32,10 @@
   # bug_id: number; the ID of the bug being changed.
   #%]
 
+[%# The global Bugzilla->cgi object is used to obtain form variable values. %]
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
 [% PROCESS global/variables.none.tmpl %]
 
 [% UNLESS header_done %]
@@ -62,7 +64,7 @@
 
 <p>
   Your comment was:<br>
-  <blockquote><pre>[% form.comment FILTER html %]</pre></blockquote>
+  <blockquote><pre>[% cgi.param("comment") FILTER html %]</pre></blockquote>
 </p>
 
 <p>
diff --git a/template/en/default/bug/process/verify-new-product.html.tmpl b/template/en/default/bug/process/verify-new-product.html.tmpl
index 33acceebe..a83430079 100644
--- a/template/en/default/bug/process/verify-new-product.html.tmpl
+++ b/template/en/default/bug/process/verify-new-product.html.tmpl
@@ -20,8 +20,6 @@
   #%]
 
 [%# INTERFACE:
-  # form: hash; the form values submitted to the script
-  # mform: hash; the form multi-values submitted to the script
   # verify_fields: boolean; whether or not to verify
   #   the version, component, and target milestone fields
   # versions: array; versions for the new product.
@@ -35,6 +33,10 @@
   #   the target milestone field
   #%]
 
+[%# The global Bugzilla->cgi object is used to obtain form variable values. %]
+[% USE Bugzilla %]
+[% cgi = Bugzilla.cgi %]
+
 [% PROCESS global/variables.none.tmpl %]
 
 [% PROCESS global/header.html.tmpl %]
@@ -51,12 +53,12 @@
   <p>
   [% IF use_target_milestone %]
     You are moving the [% terms.bug %](s) to the product 
-    <b>[% form.product FILTER html %]</b>,
+    <b>[% cgi.param("product") FILTER html %]</b>,
     and the version, component, and/or target milestone fields are no longer
     correct.  Please set the correct version, component, and target milestone now:
   [% ELSE %]
     You are moving the [% terms.bug %](s) to the product 
-    <b>[% form.product FILTER html %]</b>,
+    <b>[% cgi.param("product") FILTER html %]</b>,
     and the version and component fields are no longer correct.
     Please set the correct version and component now:
   [% END %]