lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17628 from atm-maxime/fix/ticket3

Browse Source 
Fix missing substitutionarray on ticket presend
This commit is contained in:
Laurent Destailleur 2021-05-17 08:01:21 +02:00 committed by GitHub
commit 77bcd7ecff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/ticket/card.php
View File

@ -1297,15 +1297,28 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
// add a message // add a message
if ($action == 'presend' || $action == 'presend_addmessage') if ($action == 'presend' || $action == 'presend_addmessage')
{ {
if ($object->fk_soc > 0) {
$object->fetch_thirdparty();
}
$outputlangs = $langs;
$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)) {
$newlang = $object->thirdparty->default_lang;
}
$arrayoffamiliestoexclude = array('objectamount');
$action = 'add_message'; // action to use to post the message $action = 'add_message'; // action to use to post the message
$modelmail = 'ticket_send'; $modelmail = 'ticket_send';
// Substitution array // Substitution array
$morehtmlright = ''; $morehtmlright = '';
$help = ""; $help = "";
$substitutionarray = array(); $substitutionarray = getCommonSubstitutionArray($newlang, 0, $arrayoffamiliestoexclude, $object);
if ($object->fk_soc > 0) { if ($object->fk_soc > 0) {
$object->fetch_thirdparty();
$substitutionarray['__THIRDPARTY_NAME__'] = $object->thirdparty->name; $substitutionarray['__THIRDPARTY_NAME__'] = $object->thirdparty->name;
} }
$substitutionarray['__USER_SIGNATURE__'] = $user->signature; $substitutionarray['__USER_SIGNATURE__'] = $user->signature;
@ -1338,16 +1351,6 @@ elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action =
print '<hr>'; print '<hr>';
// Define output language
$outputlangs = $langs;
$newlang = '';
if ($conf->global->MAIN_MULTILANGS && empty($newlang) && !empty($_REQUEST['lang_id'])) {
$newlang = $_REQUEST['lang_id'];
}
if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
$newlang = $object->default_lang;
}
$formticket = new FormTicket($db); $formticket = new FormTicket($db);
$formticket->action = $action; $formticket->action = $action;