Fix possibly wrong error message when contact with the same email exists on move/copy

11 years ago · eed897ca03
parent f22de58087
commit eed897ca03
2 changed files with 6 additions and 6 deletions
--- a/program/steps/addressbook/copy.inc
+++ b/program/steps/addressbook/copy.inc
@ -88,9 +88,9 @@ foreach ($cids as $source => $cid) {
            }
        }
        else {
-            $record = $result->first();
+            $record   = $result->first();
-            $ids[] = $record['ID'];
+            $ids[]    = $record['ID'];
-            $errormsg = empty($a_record['email']) ? 'contactnameexists' : 'contactexists';
+            $errormsg = empty($email) ? 'contactnameexists' : 'contactexists';
        }
    }
--- a/program/steps/addressbook/move.inc
+++ b/program/steps/addressbook/move.inc
@ -97,9 +97,9 @@ foreach ($cids as $source => $source_cids) {
            }
        }
        else {
-            $record = $result->first();
+            $record   = $result->first();
-            $ids[] = $record['ID'];
+            $ids[]    = $record['ID'];
-            $errormsg = empty($a_record['email']) ? 'contactnameexists' : 'contactexists';
+            $errormsg = empty($email) ? 'contactnameexists' : 'contactexists';
        }
    }