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

Infolog: Avoid errors adding app replacements if incorrect parameters given

Browse Source
This commit is contained in:
nathan 2021-10-15 09:09:53 -06:00 committed by Ralf Becker
parent b320f7517f
commit d7de30a423
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/src/Storage/Merge.php
View File

@ -1793,6 +1793,10 @@ abstract class Merge
public function get_app_replacements($app, $id, $content, $prefix = '')
{
$replacements = array();
if(!$app || $id || !$content)
{
return $replacements;
}
if($app == 'addressbook')
{
return $this->contact_replacements($id, $prefix, false, $content);

4
infolog/inc/class.infolog_merge.inc.php
View File

@ -183,9 +183,9 @@ class infolog_merge extends Api\Storage\Merge
$info += $this->get_all_links('infolog', $id, $prefix, $content);
// Add contact fields
if($array['info_link'] && $array['info_link']['app'] && $array['info_link']['id'])
if($array['info_link'] && is_array($array['info_link']) && $array['info_link']['app'] && $array['info_link']['id'])
{
$info+=$this->get_app_replacements($array['info_link']['app'], $array['info_link']['id'], $content, 'info_contact');
$info += $this->get_app_replacements($array['info_link']['app'], $array['info_link']['id'], $content, 'info_contact');
}
// Add owner fields
$info += $this->contact_replacements(Api\Accounts::id2name($info_owner,'person_id'),'info_owner');