holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Addressbook - fix photos not imported via Import / Export

Browse Source
This commit is contained in:
nathangray 2018-11-22 09:55:27 -07:00
parent 4afa2da066
commit ae28ee1de0
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_import_contacts_csv.inc.php
View File

@ -292,7 +292,7 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
{ {
$_data['photo_unchanged'] = false; $_data['photo_unchanged'] = false;
} }
switch ($_action) { switch ($_action) {
case 'none' : case 'none' :
return true; return true;

5
addressbook/inc/class.addressbook_import_vcard.inc.php
View File

@ -185,6 +185,11 @@ class addressbook_import_vcard implements importexport_iface_import_plugin {
{ {
$record['cat_id'] = implode(',',$this->bocontacts->find_or_add_categories($record['cat_id'], -1)); $record['cat_id'] = implode(',',$this->bocontacts->find_or_add_categories($record['cat_id'], -1));
} }
// Make sure picture is loaded/updated
if($record['jpegphoto'])
{
$record['photo_unchanged'] = false;
}
return $record; return $record;
} }