Aleksander Machniak
2014-04-24 eed897ca030bff7a684d15be3bf46fc0a9565a82
Fix possibly wrong error message when contact with the same email exists on move/copy
2 files modified
12 ■■■■ changed files
program/steps/addressbook/copy.inc 6 ●●●● patch | view | raw | blame | history
program/steps/addressbook/move.inc 6 ●●●● patch | view | raw | blame | history
program/steps/addressbook/copy.inc
@@ -88,9 +88,9 @@
            }
        }
        else {
            $record = $result->first();
            $ids[] = $record['ID'];
            $errormsg = empty($a_record['email']) ? 'contactnameexists' : 'contactexists';
            $record   = $result->first();
            $ids[]    = $record['ID'];
            $errormsg = empty($email) ? 'contactnameexists' : 'contactexists';
        }
    }
program/steps/addressbook/move.inc
@@ -97,9 +97,9 @@
            }
        }
        else {
            $record = $result->first();
            $ids[] = $record['ID'];
            $errormsg = empty($a_record['email']) ? 'contactnameexists' : 'contactexists';
            $record   = $result->first();
            $ids[]    = $record['ID'];
            $errormsg = empty($email) ? 'contactnameexists' : 'contactexists';
        }
    }