X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=FS%2FFS%2Fcontact.pm;fp=FS%2FFS%2Fcontact.pm;h=a2fc99c348968bc6a762de1098f6691d6d99d014;hb=da863bce6c626f566e5e33e5a8896f6ae4aba470;hp=d6869abc83151930d4cf5f01cc3b2710b712efce;hpb=0e8e082b68d6210eb8749ac6211b969818928f3d;p=freeside.git diff --git a/FS/FS/contact.pm b/FS/FS/contact.pm index d6869abc8..a2fc99c34 100644 --- a/FS/FS/contact.pm +++ b/FS/FS/contact.pm @@ -534,30 +534,38 @@ sub replace { if ( defined($self->hashref->{'emailaddress'}) ) { - #ineffecient but whatever, how many email addresses can there be? - + my %contact_emails = (); foreach my $contact_email ( $self->contact_email ) { - my $error = $contact_email->delete; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return $error; - } + $contact_emails{$contact_email->emailaddress} = '1'; } foreach my $email ( split(/\s*,\s*/, $self->get('emailaddress') ) ) { - my $contact_email = new FS::contact_email { - 'contactnum' => $self->contactnum, - 'emailaddress' => $email, - }; - $error = $contact_email->insert; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return $error; + unless ($contact_emails{$email}) { + my $contact_email = new FS::contact_email { + 'contactnum' => $self->contactnum, + 'emailaddress' => $email, + }; + $error = $contact_email->insert; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } } + else { delete($contact_emails{$email}); } } + foreach my $contact_email ( $self->contact_email ) { + if ($contact_emails{$contact_email->emailaddress}) { + my $error = $contact_email->delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + } + } unless ( $skip_fuzzyfiles ) { #unless ( $import || $skip_fuzzyfiles ) {