From 94355dd832df5a0f1bf5e9716e0eb8a23eb49f1b Mon Sep 17 00:00:00 2001
From: Gerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>
Date: Sat, 1 Apr 2006 14:53:03 +0000
Subject: [PATCH] #56676, unset($_SESSION['messages']);, patch by chx

---
 includes/bootstrap.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 0728aaf8cfcc..0be9f92faf4a 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -637,8 +637,9 @@ function drupal_set_message($message = NULL, $type = 'status') {
  * As a side effect, this function clears the message queue.
  */
 function drupal_get_messages() {
-  $messages = drupal_set_message();
-  unset($_SESSION['messages']);
+  if ($messages = drupal_set_message()) {
+    unset($_SESSION['messages']);
+  }
 
   return $messages;
 }
-- 
GitLab