extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-28 00:39:19 +01:00
Code Issues 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 ce20aaaba8
commit 7d14918e49
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,6 +286,13 @@ class addressbook_import_contacts_csv extends importexport_basic_import_csv {
*/ */
protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) { protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
$_data = $record->get_record_array(); $_data = $record->get_record_array();
// Make sure picture is loaded/updated
if($_data['jpegphoto'])
{
$_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

@ -184,6 +184,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;
} }