diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php index 517b4eeb8e9..6283d78d95e 100644 --- a/htdocs/admin/oauth.php +++ b/htdocs/admin/oauth.php @@ -270,9 +270,9 @@ if ($action == 'update') if (! $error) { - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null); } else { - setEventMessage($langs->trans("Error"),'errors'); + setEventMessages($langs->trans("Error"), null, 'errors'); } } diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php index e447722fc67..eeecc25fbd2 100644 --- a/htdocs/core/actions_printing.inc.php +++ b/htdocs/core/actions_printing.inc.php @@ -48,18 +48,18 @@ if ($action == 'print_file' and $user->rights->printing->read) $subdir=(GETPOST('printer', 'alpha')=='expedition'?'sending':''); $ret = $printer->print_file(GETPOST('file', 'alpha'), GETPOST('printer', 'alpha'), $subdir); if ($ret < 0) { - setEventMessage($printer->error, 'errors'); + setEventMessages($printer->error, $printer->errors, 'errors'); } if ($ret==0) { - setEventMessage($printer->error, 'warning'); - setEventMessage($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->trans("ViaModule").' '.$printer->name); + setEventMessages($printer->error, $printer->errors, 'warning'); + setEventMessages($langs->trans("FileWasSentToPrinter", basename(GETPOST('file'))).' '.$langs->trans("ViaModule").' '.$printer->name, null); $printed++; } } } - if ($printed==0) setEventMessage($langs->trans("NoActivePrintingModuleFound")); + if ($printed==0) setEventMessages($langs->trans("NoActivePrintingModuleFound"), null); } else { - setEventMessage($langs->trans("NoModuleFound"), 'warning'); + setEventMessages($langs->trans("NoModuleFound"), null, 'warning'); } $action = ''; } diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php index a779582d108..da7de1bbdfb 100644 --- a/htdocs/printing/admin/printing.php +++ b/htdocs/printing/admin/printing.php @@ -50,7 +50,7 @@ if (!$mode) $mode='config'; if (($mode == 'test' || $mode == 'setup') && empty($driver)) { - setEventMessage($langs->trans('PleaseSelectaDriverfromList')); + setEventMessages($langs->trans('PleaseSelectaDriverfromList'), null); header("Location: ".$_SERVER['PHP_SELF'].'?mode=config'); exit; } @@ -68,7 +68,7 @@ if ($action == 'setconst' && $user->admin) if (! $error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null); } else { @@ -88,7 +88,7 @@ if ($action == 'setvalue' && $user->admin) if (! $error) { $db->commit(); - setEventMessage($langs->trans("SetupSaved")); + setEventMessages($langs->trans("SetupSaved"), null); } else {