Security update for Core, with self-updated composer

[yaffs-website] / web / core / lib / Drupal / Core / Render / Element / StatusMessages.php

diff --git a/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php b/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
index d16c245a1d819228100b5e36367af73d69fad126..530457fd90621fa5c2a2f718cb571c26d6ece32e 100644 (file)
--- a/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
+++ b/web/core/lib/Drupal/Core/Render/Element/StatusMessages.php
@@ -73,17 +73,22 @@ class StatusMessages extends RenderElement {
    * @see drupal_get_messages()
    */
   public static function renderMessages($type) {
-    // Render the messages.
-    return [
-      '#theme' => 'status_messages',
-      // @todo Improve when https://www.drupal.org/node/2278383 lands.
-      '#message_list' => drupal_get_messages($type),
-      '#status_headings' => [
-        'status' => t('Status message'),
-        'error' => t('Error message'),
-        'warning' => t('Warning message'),
-      ],
-    ];
+    $render = [];
+    $messages = drupal_get_messages($type);
+    if ($messages) {
+      // Render the messages.
+      $render = [
+        '#theme' => 'status_messages',
+        // @todo Improve when https://www.drupal.org/node/2278383 lands.
+        '#message_list' => $messages,
+        '#status_headings' => [
+          'status' => t('Status message'),
+          'error' => t('Error message'),
+          'warning' => t('Warning message'),
+        ],
+      ];
+    }
+    return $render;
   }
 
 }