From: justdave%bugzilla.org <>
Date: Tue, 11 Mar 2008 20:50:04 +0000 (+0000)
Subject: Bug 422111: rederive regexp-based group memberships on the destination user after... 
X-Git-Tag: bugzilla-3.1.3~288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c6954f9189af00752c59112b79c79d8bef49390;p=thirdparty%2Fbugzilla.git

Bug 422111: rederive regexp-based group memberships on the destination user after merging Bugzilla accounts, since some of the merged group memberships may no longer apply.
a=LpSolit
---

diff --git a/contrib/merge-users.pl b/contrib/merge-users.pl
index 70250a1eeb..80c516e04c 100644
--- a/contrib/merge-users.pl
+++ b/contrib/merge-users.pl
@@ -49,6 +49,7 @@ use lib qw(. lib);
 use Bugzilla;
 use Bugzilla::Constants;
 use Bugzilla::Util;
+use Bugzilla::User;
 
 use Getopt::Long;
 use Pod::Usage;
@@ -229,6 +230,12 @@ print "OK, records in the 'mailto' column of the 'whine_schedules' table\n" .
 # Delete the old record from the profiles table.
 $dbh->do('DELETE FROM profiles WHERE userid = ?', undef, $old_id);
 
+# rederive regexp-based group memberships, because we merged all memberships
+# from all of the accounts, and since the email address isn't the same on
+# them, some of them may no longer match the regexps.
+my $user = new Bugzilla::User($new_id);
+$user->derive_regexp_groups();
+
 # Commit the transaction
 $dbh->bz_commit_transaction();