From d7de30a423efa1e09940c2e827e66bd93d30d529 Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 15 Oct 2021 09:09:53 -0600 Subject: [PATCH] Infolog: Avoid errors adding app replacements if incorrect parameters given --- api/src/Storage/Merge.php | 4 ++++ infolog/inc/class.infolog_merge.inc.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/api/src/Storage/Merge.php b/api/src/Storage/Merge.php index 336a9f0681..9714ec47d9 100644 --- a/api/src/Storage/Merge.php +++ b/api/src/Storage/Merge.php @@ -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); diff --git a/infolog/inc/class.infolog_merge.inc.php b/infolog/inc/class.infolog_merge.inc.php index eb8ffd61c3..c36a43d16f 100644 --- a/infolog/inc/class.infolog_merge.inc.php +++ b/infolog/inc/class.infolog_merge.inc.php @@ -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');