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

fix for bug/problem regarding the merge of contacts: main links of linked addresses where not moved to the new target

Browse Source
This commit is contained in:
Klaus Leithoff 2011-02-15 14:46:09 +00:00
parent 53a6add628
commit 18208414bc
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -1621,7 +1621,24 @@ class addressbook_bo extends addressbook_so
} }
foreach(egw_link::get_links('addressbook',$contact['id']) as $data) foreach(egw_link::get_links('addressbook',$contact['id']) as $data)
{ {
egw_link::link('addressbook',$target['id'],$data['app'],$data['id'],$data['remark'],$target['owner']); //_debug_array(array('function'=>__METHOD__,'line'=>__LINE__,'app'=>'addressbook','id'=>$contact['id'],'data:'=>$data,'target'=>$target['id']));
// info_from and info_link_id (main link)
$newlinkID = egw_link::link('addressbook',$target['id'],$data['app'],$data['id'],$data['remark'],$target['owner']);
//_debug_array(array('newLinkID'=>$newlinkID));
if ($newlinkID)
{
// update egw_infolog set info_link_id=$newlinkID where info_id=$data['id'] and info_link_id=$data['link_id']
if ($data['app']=='infolog')
{
$this->db->update('egw_infolog',array(
'info_link_id' => $newlinkID
),array(
'info_id' => $data['id'],
'info_link_id' => $data['link_id']
),__LINE__,__FILE__,'infolog');
}
unset($newlinkID);
}
} }
if ($this->delete($contact['id'])) $success++; if ($this->delete($contact['id'])) $success++;
} }