Merge branch 'fixes/formconfirm-pass-action' of

https://github.com/vold-lu/dolibarr into
vold-lu-fixes/formconfirm-pass-action

# Conflicts:
#	htdocs/core/class/html.form.class.php
This commit is contained in:
Laurent Destailleur 2022-05-10 11:07:16 +02:00
commit c2143e01ee

View File

@ -5055,8 +5055,8 @@ class Form
$autoOpen = false;
$dialogconfirm .= '-'.$button;
}
$pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.$action.'&confirm=yes';
$pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'confirm=no' : '');
$pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.urlencode($action).'&confirm=yes';
$pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.urlencode($action).'&confirm=no' : '');
// Add input fields into list of fields to read during submit (inputok and inputko)
if (is_array($formquestion)) {