From 1852f4ec757270834a874b1bdbd899389965b105 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 28 Jul 2015 22:42:51 +0800
Subject: Bug 1188374 - disable account disabling

---
 template/en/default/account/prefs/account.html.tmpl | 2 ++
 userprefs.cgi                                       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/template/en/default/account/prefs/account.html.tmpl b/template/en/default/account/prefs/account.html.tmpl
index 919563440..98ce6963f 100644
--- a/template/en/default/account/prefs/account.html.tmpl
+++ b/template/en/default/account/prefs/account.html.tmpl
@@ -118,6 +118,7 @@
     </tr>
   [% END %]
 
+<!--
   <tr>
     <td></td>
     <td>
@@ -145,5 +146,6 @@
     <td></td>
     <td><hr></td>
   </tr>
+-->
 
 </table>
diff --git a/userprefs.cgi b/userprefs.cgi
index 52c5adba0..2814e578c 100755
--- a/userprefs.cgi
+++ b/userprefs.cgi
@@ -639,7 +639,7 @@ SWITCH: for ($current_tab_name) {
     last SWITCH if $handled;
 
     /^account$/ && do {
-        DisableAccount() if $cgi->param('account_disable');
+        # XXX DisableAccount() if $cgi->param('account_disable');
         SaveAccount() if $save_changes;
         DoAccount();
         last SWITCH;
-- 
cgit v1.2.3-24-g4f1b