From: jocuri%softhome.net <>
Date: Thu, 11 Nov 2004 21:20:15 +0000 (+0000)
Subject: Backing out patch for bug 267494 since it brokes the tinderbox builds.
X-Git-Tag: bugzilla-2.16.8~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c59be8cbcd6ec22bb4783804203ae73d9be0ff84;p=thirdparty%2Fbugzilla.git

Backing out patch for bug 267494 since it brokes the tinderbox builds.
---

diff --git a/template/en/default/account/prefs/email.html.tmpl b/template/en/default/account/prefs/email.html.tmpl
index 71de881c65..5bf4920174 100644
--- a/template/en/default/account/prefs/email.html.tmpl
+++ b/template/en/default/account/prefs/email.html.tmpl
@@ -17,7 +17,6 @@
   # Rights Reserved.
   #
   # Contributor(s): Gervase Markham <gerv@gerv.net>
-  #                 Shane H. W. Travis <travis@sedsystems.ca>
   #%]
 
 [%# INTERFACE:
@@ -33,7 +32,6 @@
   #%]
 
 [% useqacontact = Param('useqacontact') %]
-[% usevotes = Param('usevotes') %]
  
 <table>
   [% IF Param('supportwatchers') %]
@@ -100,7 +98,7 @@
 
 <table width="100%" border="1">
   <tr>
-    <td colspan="[% (useqacontact AND usevotes) ? '5' : ((useqacontact OR usevotes) ? '4' : '3') %]" align="center" width="50%">
+    <td colspan="[% useqacontact ? '5' : '4' %]" align="center" width="50%">
       <b>When my relationship to this bug is:</b>
     </td>
     <td rowspan="2" width="50%">
@@ -123,11 +121,9 @@
     <td align="center" width="10%">
       <b>CC</b>
     </td>
-    [% IF usevotes %]
-      <td align="center" width="10%">
-        <b>Voter</b>
-      </td>
-    [% END %]
+    <td align="center" width="10%">
+      <b>Voter</b>
+    </td>
   </tr>
 
   [% FOREACH reason = [ 
@@ -151,7 +147,6 @@
       [% FOREACH role = [ "Reporter", "Owner", "QAcontact", "CClist", "Voter" ] 
        %]
         [% NEXT IF role == "QAcontact" AND NOT useqacontact %]
-        [% NEXT IF role == "Voter" AND NOT usevotes %]
         <td align="center">
           <input type="checkbox" name="email[% role %][% reason.name %]" value="on"
             [% " checked" IF $role.${reason.name} %]>