From a8ef3e105b01d4a7f765edbe53b7af53ed179020 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Mon, 27 Jul 2015 12:19:17 +0800
Subject: Bug 1186788 - disabling an account should always disable bugmail

---
 Bugzilla/Install/DB.pm | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'Bugzilla/Install')

diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index 92015f22f..0892d3293 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -732,6 +732,8 @@ sub update_table_definitions {
 
     _add_attach_size();
 
+    _fix_disable_mail();
+
     ################################################################
     # New --TABLE-- changes should go *** A B O V E *** this point #
     ################################################################
@@ -3847,6 +3849,11 @@ sub _add_attach_size {
     ");
 }
 
+sub _fix_disable_mail {
+    # you can no longer have disabled accounts with enabled mail
+    Bugzilla->dbh->do("UPDATE profiles SET disable_mail = 1 WHERE is_enabled = 0");
+}
+
 1;
 
 __END__
-- 
cgit v1.2.3-24-g4f1b