From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 27 Apr 2016 18:25:56 +0000 (+0200)
Subject: Bug 1268146 - profiles.email is set back to match profiles.login_name every time... 
X-Git-Tag: release-5.1.1~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86facf92f2346a817f7e7399718a66dd4fab7f8e;p=thirdparty%2Fbugzilla.git

Bug 1268146 - profiles.email is set back to match profiles.login_name every time checksetup.pl is run
r=gerv
---

diff --git a/Bugzilla/Install/DB.pm b/Bugzilla/Install/DB.pm
index b7ca7c657b..5ac8bc5aba 100644
--- a/Bugzilla/Install/DB.pm
+++ b/Bugzilla/Install/DB.pm
@@ -3962,9 +3962,11 @@ sub _sanitize_audit_log_table {
 }
 
 sub _split_login_and_email {
-    my ($old_params) = (@_);
-
+    my ($old_params) = @_;
     my $dbh = Bugzilla->dbh;
+
+    return if $dbh->bz_column_info('profiles', 'email');
+
     $dbh->bz_add_column('profiles', 'email',
                         {TYPE => 'varchar(255)', NOTNULL => 1}, '');
     $dbh->do('UPDATE profiles SET email = login_name');