3 files changed, 10 insertions, 8 deletions
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 3389b27af..d72e2d2ae 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -1,5 +1,4 @@
 <?php
-
 // $Id$
 
 function chameleon_help($section) {
@@ -66,8 +65,9 @@ function chameleon_header($title = "") {
     $output .= "<small>$help</small><hr />";
   }
 
-  if ($message = drupal_get_message()) {
-    $output .= "<strong>". t("Status") ."</strong>: ". $message->message ."<hr />";
+  foreach (drupal_get_messages() as $message) {
+    list($message, $type) = $message;
+    $output .= "<strong>". t("Status") ."</strong>: $message<hr />";
   }
 
   return $output;
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index f01c49a9e..b2d8d8316 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -65,8 +65,9 @@ function marvin_header() {
     $output .= "<small>$help</small><hr />";
   }
 
-  if ($message = drupal_get_message()) {
-    $output .= "<strong>". t("Status") ."</strong>: ". $message->message ."<hr />";
+  foreach (drupal_get_messages() as $message) {
+    list($message, $type) = $message;
+    $output .= "<strong>". t("Status") ."</strong>: $message<hr />";
   }
 
   return $output;
diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme
index 7e87cf73c..1c5e6e977 100644
--- a/themes/xtemplate/xtemplate.theme
+++ b/themes/xtemplate/xtemplate.theme
@@ -111,9 +111,10 @@ function xtemplate_header() {
     $xtemplate->template->parse("header.help");
   }
 
-  if ($message = drupal_get_message()) {
-    $xtemplate->template->assign("message", ucfirst($message->message));
-    $xtemplate->template->assign("type", $message->type);
+  foreach (drupal_get_messages() as $message) {
+    list($message, $type) = $message;
+    $xtemplate->template->assign("message", ucfirst($message));
+    $xtemplate->template->assign("type", $type);
     $xtemplate->template->parse("header.message");
   }