From 3b814ebba2109c41b5d931981b0b7caa269564cf Mon Sep 17 00:00:00 2001 From: jfefe Date: Sun, 11 Mar 2018 16:54:39 +0100 Subject: [PATCH] Try to fix phpunit test (br tag isuue) --- .../interface_50_modTicketsup_TicketEmail.class.php | 8 ++++---- htdocs/public/ticketsup/create_ticket.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php index 4f757c268ac..1990f184f84 100644 --- a/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php +++ b/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php @@ -134,8 +134,8 @@ class InterfaceTicketEmail extends DolibarrTriggers } $message .= ''; - $message .= '

' . $langs->trans('Message') . ' :
' . $object->message . '

'; - $message .= '

' . $langs->trans('SeeThisTicketIntomanagementInterface') . '

'; + $message .= '

' . $langs->trans('Message') . ' :
' . $object->message . '

'; + $message .= '

' . $langs->trans('SeeThisTicketIntomanagementInterface') . '

'; $sendto = $userstat->email; $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>'; @@ -202,7 +202,7 @@ class InterfaceTicketEmail extends DolibarrTriggers $message_admin.='

'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'

'; } - $message_admin.='

'.$langs->trans('Message').' :
'.$object->message.'

'; + $message_admin.='

'.$langs->trans('Message').' :
'.$object->message.'

'; $message_admin.='

'.$langs->trans('SeeThisTicketIntomanagementInterface').'

'; $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKETS_NOTIFICATION_EMAIL_FROM.'>'; @@ -250,7 +250,7 @@ class InterfaceTicketEmail extends DolibarrTriggers } } $message_customer.=''; - $message_customer.='

'.$langs->trans('Message').' :
'.$object->message.'

'; + $message_customer.='

'.$langs->trans('Message').' :
'.$object->message.'

'; $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE?$conf->global->TICKETS_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/ticketsup/public/view.php', 2)).'?track_id='.$object->track_id; $message_customer.='

' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : '.$url_public_ticket.'

'; $message_customer.='

'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'

'; diff --git a/htdocs/public/ticketsup/create_ticket.php b/htdocs/public/ticketsup/create_ticket.php index 06c6b85cb02..867658b48ac 100644 --- a/htdocs/public/ticketsup/create_ticket.php +++ b/htdocs/public/ticketsup/create_ticket.php @@ -275,7 +275,7 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) { } } $message_admin .= ''; - $message_admin .= '

' . $langs->trans('Message') . ' :
' . $object->message . '

'; + $message_admin .= '

' . $langs->trans('Message') . ' :
' . $object->message . '

'; $message_admin .= '

' . $langs->trans('SeeThisTicketIntomanagementInterface') . '

'; $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '>'; @@ -367,7 +367,7 @@ if ($action != "infos_success") { $formticket->showForm(); } else { print '
' . $langs->trans('MesgInfosPublicTicketCreatedWithTrackId', '' . $object->track_id . ''); - print '
'; + print '
'; print $langs->trans('PleaseRememberThisId'); } print '
';