Allow multiple messages

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@393 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/design.inc.php b/design.inc.php
index 531727313fbdd8ca012ab70687f01ae4651c630e..436336b131bdd9e32d0c1f94d4b2e1f2db75fc26 100644 (file)
--- a/design.inc.php
+++ b/design.inc.php
@@ -39,9 +39,9 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
                echo "$title</p>\n";
        }
        echo "<h2>$title" . (strlen($title2) ? ": " . htmlspecialchars($title2) : "") . "</h2>\n";
-       if ($_SESSION["message"]) {
-               echo "<p class='message'>$_SESSION[message]</p>\n";
-               $_SESSION["message"] = "";
+       if ($_SESSION["messages"]) {
+               echo "<p class='message'>" . implode("<br />", $_SESSION["messages"]) . "</p>\n";
+               $_SESSION["messages"] = array();
        }
        if (!$_SESSION["tokens"][$_GET["server"]]["?logout"]) {
                $_SESSION["tokens"][$_GET["server"]]["?logout"] = rand(1, 1e6);

diff --git a/functions.inc.php b/functions.inc.php
index 6319ea7442762c7b65d1ec4f3a9a40af336c364f..e4d7cd99b9e91de162555d47a09b718df03b03c6 100644 (file)
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -186,7 +186,7 @@ function token_delete() {
 
 function redirect($location, $message = null) {
        if (isset($message)) {
-               $_SESSION["message"] = $message;
+               $_SESSION["messages"][] = $message;
        }
        token_delete();
        if (strlen(SID)) {