Bug 1088022 - Bump min version to CGI 4.09

r=dkl

4 files changed, 16 insertions, 22 deletions

diff --git a/template/en/default/global/confirm-user-match.html.tmpl b/template/en/default/global/confirm-user-match.html.tmpl
index 613f097e1..b497256a3 100644
--- a/template/en/default/global/confirm-user-match.html.tmpl
+++ b/template/en/default/global/confirm-user-match.html.tmpl
@@ -41,13 +41,11 @@
 [% IF matchsuccess == 1 %]
   [% PROCESS global/header.html.tmpl title="Confirm Match" %]
 
-  [% USE Bugzilla %]
-
   <form method="post" 
   [% IF script -%]
     action="[% script %]"
   [%- END -%]
-  [% IF Bugzilla.cgi.param("data") %]
+  [% IF cgi_param("data") %]
     enctype="multipart/form-data"
   [% END %]
   >
@@ -147,7 +145,7 @@
 
   [% SET exclude_these = ['Bugzilla_login', 'Bugzilla_password'] %]
   [% FOREACH key IN matches.keys %]
-    [% exclude_these.push(key) IF Bugzilla.cgi.param(key) == '' %]
+    [% exclude_these.push(key) IF cgi_param(key) == '' %]
   [% END %]
   [% SET exclude = '^' _ exclude_these.join('|') _ '$' %]
   [% PROCESS "global/hidden-fields.html.tmpl" exclude = exclude %]
diff --git a/template/en/default/global/hidden-fields.html.tmpl b/template/en/default/global/hidden-fields.html.tmpl
index 88d267354..f8f353233 100644
--- a/template/en/default/global/hidden-fields.html.tmpl
+++ b/template/en/default/global/hidden-fields.html.tmpl
@@ -16,12 +16,9 @@
 [% cgi = Bugzilla.cgi %]
 
 [%# Generate hidden form fields for non-excluded fields. %]
-[% FOREACH field = cgi.param() %]
+[% FOREACH field = cgi.multi_param() %]
   [% NEXT IF exclude && field.search(exclude) %]
-  [%# The '.slice(0)' bit is here to force the 'param(field)' to be evaluated
-      in a list context, so we can avoid extra code checking for single valued or
-      empty fields %]
-  [% IF field == "data" && cgi.param("data") %]
+  [% IF field == "data" && cgi_param("data") %]
     <div class="box">
       <p>
         We were unable to store the file you uploaded because of incomplete information
@@ -30,7 +27,7 @@
         remaining missing information above.
       </p>
       <p>
-        Please re-attach the file <b>[% cgi.param(field) FILTER html %]</b> in
+        Please re-attach the file <b>[% cgi_param(field) FILTER html %]</b> in
         the field below:
       </p>
       <p>
@@ -38,7 +35,7 @@
       </p>
     </div>
   [% ELSE %]
-    [% FOREACH mvalue = cgi.param(field).slice(0) %]
+    [% FOREACH mvalue = cgi.multi_param(field) %]
       <input type="hidden" name="[% field FILTER html %]"
              value="[% mvalue FILTER html_linebreak %]">
     [% END %]
diff --git a/template/en/default/global/product-select.html.tmpl b/template/en/default/global/product-select.html.tmpl
index 23a7b3d58..f9e5670ad 100644
--- a/template/en/default/global/product-select.html.tmpl
+++ b/template/en/default/global/product-select.html.tmpl
@@ -69,7 +69,7 @@
         <optgroup label="[% c FILTER html %]">
           [% FOREACH p = classifications.$c %]
             <option value="[% p.$valueattribute FILTER html %]"
-              [% " selected" IF (cgi.param(name) == p.name) || (value.contains(p.name)) %]>
+              [% " selected" IF cgi_param(name) == p.name || value.contains(p.name) %]>
               [% p.name FILTER html %]
             </option>
           [% END %]
@@ -81,7 +81,7 @@
       [% END %]
       [% FOREACH p = products %]
         <option value="[% p.$valueattribute FILTER html %]"
-          [% " selected" IF (cgi.param(name) == p.name) || (value.contains(p.name)) %]>
+          [% " selected" IF cgi_param(name) == p.name || value.contains(p.name) %]>
           [% p.name FILTER html %]
         </option>
       [% END %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 8c0cc8b7a..bd8c54f2d 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -2036,29 +2036,28 @@
   Please press <b>Back</b> and try again.
 </p>
 
-[%# If a saved search fails, people want the ability to edit or delete it. 
+[%# If a saved search fails, people want the ability to edit or delete it.
   # This is the best way of getting information about that possible saved
   # search from any error call location. %]
 
-[% namedcmd = Bugzilla.cgi.param("namedcmd") %]
-[% sharer_id = Bugzilla.cgi.param("sharer_id") %]
+[% namedcmd = cgi_param("namedcmd") %]
 [% IF namedcmd AND error != "missing_query" 
                AND error != "saved_search_used_by_whines"
-               AND !sharer_id %]
-  <p>  
-    Alternatively, you can    
+               AND !cgi_param("sharer_id") %]
+  <p>
+    Alternatively, you can
     <a href="buglist.cgi?cmdtype=dorem&amp;remaction=forget&amp;namedcmd=
                   [% namedcmd FILTER uri %]">forget</a>
-                  
+
     [% FOREACH q = Bugzilla.user.queries %]
       [% IF q.name == namedcmd %]
         or <a href="query.cgi?[% q.url FILTER html %]">edit</a>
       [% END %]
     [% END %]
-    
+
     the saved search '[% namedcmd FILTER html %]'.
   </p>
-[% END %]            
+[% END %]
 
 [% PROCESS global/footer.html.tmpl %]