Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-19 06:26:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix importing contacts with no email address (#8227)

Browse Source
This commit is contained in:
Aleksander Machniak
2021-10-19 15:25:49 +02:00
parent 234fdbdd6c
commit 263003d006
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
program/actions/contacts/import.php
View File

@@ -196,8 +196,11 @@ class rcmail_action_contacts_import extends rcmail_action_contacts_index
}
// We're using UTF8 internally
$email = $vcard->email[0];
$email = rcube_utils::idn_to_utf8($email);
$email = null;
if (isset($vcard->email[0])) {
$email = $vcard->email[0];
$email = rcube_utils::idn_to_utf8($email);
}
if (!$replace) {
$existing = null;

2
program/lib/Roundcube/rcube_contacts.php
View File

@@ -809,6 +809,8 @@ class rcube_contacts extends rcube_addressbook
// save all e-mails in the database column
if (!empty($vcard->email)) {
$out['email'] = implode(self::SEPARATOR, $vcard->email);
} else {
$out['email'] = isset($save_data['email']) ? $save_data['email'] : '';
}
// join words for fulltext search