From 3ef08edceb53d620185e3e68c265b62b80c4a805 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 5 Jun 2012 18:20:17 +0000 Subject: [PATCH] show preDelete messages in list --- lam/lib/lists.inc | 2 +- lam/templates/delete.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lam/lib/lists.inc b/lam/lib/lists.inc index ee51288a..09e81ae1 100644 --- a/lam/lib/lists.inc +++ b/lam/lib/lists.inc @@ -972,7 +972,7 @@ class lamList { StatusMessage('INFO', sprintf(_('You can download your PDF files {link=%s}{color=#d2131a}here{endcolor}{endlink}.'), '../' . $_SESSION['mass_pdf']['file'])); } } - elseif (isset($_SESSION['listRedirectMessages'])) { + if (isset($_SESSION['listRedirectMessages'])) { for ($i = 0; $i < sizeof($_SESSION['listRedirectMessages']); $i++) { call_user_func_array('StatusMessage', $_SESSION['listRedirectMessages'][$i]); } diff --git a/lam/templates/delete.php b/lam/templates/delete.php index dc353df7..82606feb 100644 --- a/lam/templates/delete.php +++ b/lam/templates/delete.php @@ -147,6 +147,7 @@ if (isset($_POST['delete'])) { // Delete dns $allOk = true; + $allErrors = array(); for ($m=0; $m 0) { $stopprocessing = true; $allOk = false; @@ -273,6 +275,7 @@ if (isset($_POST['delete'])) { } echo "
\n"; } + $allErrors = array_merge($allErrors, $errors); } echo "
\n"; echo "
\n"; @@ -285,6 +288,7 @@ if (isset($_POST['delete'])) { jQuery('#backButton').button();