From 0df807b5f9ae1425fc24ada6fdcb4c672e4e8f6f Mon Sep 17 00:00:00 2001
From: Matt Selsky <selsky@columbia.edu>
Date: Tue, 26 Jun 2012 22:37:36 +0200
Subject: Bug 725373: Making someone an admin using checksetup.pl should enable
 their account if it's disabled r/a=LpSolit

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

(limited to 'Bugzilla/Install.pm')

diff --git a/Bugzilla/Install.pm b/Bugzilla/Install.pm
index cffcc704b..5d18a9aac 100644
--- a/Bugzilla/Install.pm
+++ b/Bugzilla/Install.pm
@@ -378,6 +378,12 @@ sub make_admin {
         write_params();
     }
 
+    # Make sure the new admin isn't disabled
+    if ($user->disabledtext) {
+	$user->set_disabledtext('');
+	$user->update();
+    }
+
     if (Bugzilla->usage_mode == USAGE_MODE_CMDLINE) {
         say "\n", get_text('install_admin_created', { user => $user });
     }
-- 
cgit v1.2.3-24-g4f1b