- Modified patch #7958 by Adrian: store status messages in a session so they can persist when redirection is used.

1 files changed, 9 insertions, 4 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 95cac35dc..5da3bda2c 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -40,17 +40,22 @@ function drupal_get_title() {
  * @{
  */
 function drupal_set_message($message = NULL, $type = "status") {
-  static $stored_message = array();
+  if (!isset($_SESSION['messages'])) {
+    $_SESSION['messages'] = array();
+  }
 
   if (isset($message)) {
-    $stored_message[] = array($message, $type);
+    $_SESSION['messages'][] = array($message, $type);
   }
 
-  return $stored_message;
+  return $_SESSION['messages'];
 }
 
 function drupal_get_messages() {
-  return drupal_set_message();
+  $messages = drupal_set_message();
+  $_SESSION['messages'] = array();
+
+  return $messages;
 }
 /* @} */