From 5107efb51fdeac3b9167d010141cd4bb5482c10a Mon Sep 17 00:00:00 2001
From: "wurblzap%gmail.com" <>
Date: Wed, 14 Dec 2005 04:20:12 +0000
Subject: Bug 319942: Preferences not deleted along with user accounts. Patch
 by Marc Schumann <wurblzap@gmail.com>, r=LpSolit, a=justdave

---
 .../en/default/admin/users/confirm-delete.html.tmpl    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'template/en/default/admin')

diff --git a/template/en/default/admin/users/confirm-delete.html.tmpl b/template/en/default/admin/users/confirm-delete.html.tmpl
index afe464697..71e2068ad 100644
--- a/template/en/default/admin/users/confirm-delete.html.tmpl
+++ b/template/en/default/admin/users/confirm-delete.html.tmpl
@@ -235,9 +235,9 @@
     [% display_warning = 1 %]
   [% END %]
 
-  [% IF assignee_or_qa || cc || flags.requestee || namedqueries ||
-        series || votes || watch.watched || watch.watcher ||
-        whine_events || whine_schedules %]
+  [% IF assignee_or_qa || cc || email_setting || flags.requestee ||
+        namedqueries || profile_setting || series || votes || watch.watched ||
+        watch.watcher || whine_events || whine_schedules %]
     <div class="warningmessages">
       <p>The following deletions are <b>safe</b> and will not generate
       referential integrity inconsistencies.</p>
@@ -272,6 +272,12 @@
             If you delete the user account, it will be removed from these CC lists.
           </li>
         [% END %]
+        [% IF email_setting %]
+          <li>
+            The user's e-mail settings will be deleted along with the user
+            account.
+          </li>
+        [% END %]
         [% IF flags.requestee %]
           <li>
             [% otheruser.login FILTER html %] has been
@@ -308,6 +314,12 @@
             will be deleted along with the user account.
           </li>
         [% END %]
+        [% IF profile_setting %]
+          <li>
+            The user's preference settings will be deleted along with the user
+            account.
+          </li>
+        [% END %]
         [% IF series %]
           <li>
             [% otheruser.login FILTER html %] has created
-- 
cgit v1.2.3-24-g4f1b