Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't lookup empty email when canonicalizing #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't lookup empty email when canonicalizing #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/RT/Extension/MergeUsers.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,14 @@ sub CanonicalizeEmailAddress {
if ($RT::CanonicalizeEmailAddressMatch && $RT::CanonicalizeEmailAddressReplace ) {
$address =~ s/$RT::CanonicalizeEmailAddressMatch/$RT::CanonicalizeEmailAddressReplace/gi;
}
return $address if $address eq '';

# get the user whose email address this is
my $canonical_user = RT::User->new( $RT::SystemUser );
$canonical_user->LoadByCols( EmailAddress => $address );
return $address unless $canonical_user->id;
return $address unless $canonical_user->EmailAddress && $canonical_user->EmailAddress ne $address;
return $address unless $canonical_user->EmailAddress;
return $address if $canonical_user->EmailAddress eq $address;
return $canonical_user->CanonicalizeEmailAddress(
$canonical_user->EmailAddress
);
Expand Down