Skip to content

Commit

Permalink
FIX #30010 : Use conf TICKET_MESSAGE_MAIL_INTRO instead of translatio…
Browse files Browse the repository at this point in the history
…n key (#30081)

* Use conf TICKET_MESSAGE_MAIL_INTRO instead of translation key

* Set TicketMessageMailIntroText as default value if conf empty
  • Loading branch information
evarisk-micka authored Jun 30, 2024
1 parent d6da8fa commit 7cee801
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions htdocs/ticket/class/ticket.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -2598,7 +2598,7 @@ public function newMessage($user, &$action, $private = 1, $public_area = 0)
$subject = '['.$label_title.'- ticket #'.$object->track_id.'] '.$langs->trans('TicketNewMessage');

// Message send
$message = $langs->trans('TicketMessageMailIntroText');
$message = getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO', $langs->trans('TicketMessageMailIntroText'));
$message .= '<br><br>';
$messagePost = GETPOST('message', 'restricthtml');
if (!dol_textishtml($messagePost)) {
Expand Down Expand Up @@ -2650,7 +2650,7 @@ public function newMessage($user, &$action, $private = 1, $public_area = 0)
$message_intro = $langs->trans('TicketNotificationEmailBody', "#".$object->id);
$message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE');

$message = $langs->trans('TicketMessageMailIntroText');
$message = getDolGlobalString('TICKET_MESSAGE_MAIL_INTRO', $langs->trans('TicketMessageMailIntroText'));
$message .= '<br><br>';
$messagePost = GETPOST('message', 'restricthtml');
if (!dol_textishtml($messagePost)) {
Expand Down

0 comments on commit 7cee801

Please sign in to comment.