Fix output of error message. br is no more encoded
This commit is contained in:
parent
ac5b16fd01
commit
49f6a634d0
@ -326,6 +326,7 @@ if (!empty($conf->global->$paramcreditorlong)) {
|
||||
$creditor = $conf->global->$paramcreditor;
|
||||
}
|
||||
|
||||
$mesg = '';
|
||||
|
||||
|
||||
/*
|
||||
@ -334,6 +335,7 @@ if (!empty($conf->global->$paramcreditorlong)) {
|
||||
|
||||
// Action dopayment is called after clicking/choosing the payment mode
|
||||
if ($action == 'dopayment') {
|
||||
|
||||
if ($paymentmethod == 'paypal') {
|
||||
$PAYPAL_API_PRICE = price2num(GETPOST("newamount", 'alpha'), 'MT');
|
||||
$PAYPAL_PAYMENT_TYPE = 'Sale';
|
||||
@ -357,7 +359,6 @@ if ($action == 'dopayment') {
|
||||
$shipToState = 'ID-'.$shipToState;
|
||||
}
|
||||
|
||||
$mesg = '';
|
||||
if (empty($PAYPAL_API_PRICE) || !is_numeric($PAYPAL_API_PRICE)) {
|
||||
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
|
||||
$action = '';
|
||||
@ -421,7 +422,6 @@ if ($action == 'dopayment') {
|
||||
$urlok = preg_replace('/securekey=[^&]+/', '', $urlok);
|
||||
$urlko = preg_replace('/securekey=[^&]+/', '', $urlko);
|
||||
|
||||
$mesg = '';
|
||||
if (empty($PRICE) || !is_numeric($PRICE)) {
|
||||
$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount"));
|
||||
} elseif (empty($email)) {
|
||||
@ -1984,7 +1984,7 @@ if (!$found && !$mesg) {
|
||||
}
|
||||
|
||||
if ($mesg) {
|
||||
print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg).'</div></td></tr>'."\n";
|
||||
print '<tr><td align="center" colspan="2"><br><div class="warning">'.dol_escape_htmltag($mesg, 1, 1, 'br').'</div></td></tr>'."\n";
|
||||
}
|
||||
|
||||
print '</table>'."\n";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user