From 9ff0efbcc2c04da094507ed8cdcb662fec0686aa Mon Sep 17 00:00:00 2001 From: kevin Date: Tue, 15 Jun 2021 12:04:24 +0200 Subject: [PATCH 1/3] FIX fatal error when adding message to a ticket --- htdocs/ticket/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 5ed28094e39..85e88ce012c 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -1317,7 +1317,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action = // Substitution array $morehtmlright = ''; $help = ""; - $substitutionarray = getCommonSubstitutionArray($newlang, 0, $arrayoffamiliestoexclude, $object); + $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object); if ($object->fk_soc > 0) { $substitutionarray['__THIRDPARTY_NAME__'] = $object->thirdparty->name; } From 78f41bf60e4ae95a9b3978cfc5d2a60e2b97a5ce Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 15 Jun 2021 22:04:31 +0200 Subject: [PATCH 2/3] Update card.php --- htdocs/ticket/card.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 85e88ce012c..8a571ace839 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -1305,10 +1305,14 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action = $newlang = ''; if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) { $newlang = GETPOST('lang_id', 'aZ09'); - } - if ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($object->thirdparty)) { + } elseif ($conf->global->MAIN_MULTILANGS && empty($newlang) && is_object($object->thirdparty)) { $newlang = $object->thirdparty->default_lang; } + if (!empty($newlang)) { + $outputlangs = new Translate("", $conf); + $outputlangs->setDefaultLang($newlang); + } + $arrayoffamiliestoexclude = array('objectamount'); $action = 'add_message'; // action to use to post the message From 26cae49fafb59deb74d4938c63acaadb8ebc00ec Mon Sep 17 00:00:00 2001 From: stickler-ci Date: Tue, 15 Jun 2021 20:06:48 +0000 Subject: [PATCH 3/3] Fixing style errors. --- htdocs/ticket/card.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php index 8a571ace839..687aca67378 100644 --- a/htdocs/ticket/card.php +++ b/htdocs/ticket/card.php @@ -1312,7 +1312,7 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action = $outputlangs = new Translate("", $conf); $outputlangs->setDefaultLang($newlang); } - + $arrayoffamiliestoexclude = array('objectamount'); $action = 'add_message'; // action to use to post the message