From 677d30883fefd7fcc63dceaff0a8c69f3b822168 Mon Sep 17 00:00:00 2001
From: Nabeel Shahzad <nabeel@nabeel.sh>
Date: Thu, 1 Apr 2021 17:31:53 -0400
Subject: [PATCH] Check if flash messages are strings

---
 resources/views/admin/flash/message.blade.php | 44 ++++++++++---------
 .../layouts/default/flash/message.blade.php   | 41 ++++++++---------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/resources/views/admin/flash/message.blade.php b/resources/views/admin/flash/message.blade.php
index 1f6bf746..7c0c4910 100644
--- a/resources/views/admin/flash/message.blade.php
+++ b/resources/views/admin/flash/message.blade.php
@@ -1,26 +1,30 @@
 @foreach (session('flash_notification', collect()) as $message)
-  @if ($message['overlay'])
-    @include('flash::modal', [
-        'modalClass' => 'flash-modal',
-        'title'      => $message['title'],
-        'body'       => $message['message']
-    ])
+  @if (is_string($message))
+    <div class="alert alert-error">{!! $message !!}</div>
   @else
-    <div class="alert
-                    alert-{{ $message['level'] }}
-    {{ $message['important'] ? 'alert-important' : '' }}"
-         role="alert">
-      @if ($message['important'])
-        <button type="button"
-                class="close"
-                data-dismiss="alert"
-                aria-hidden="true"
-        >&times;
-        </button>
-      @endif
+    @if ($message['overlay'])
+      @include('flash::modal', [
+          'modalClass' => 'flash-modal',
+          'title'      => $message['title'],
+          'body'       => $message['message']
+      ])
+    @else
+      <div class="alert
+                      alert-{{ $message['level'] }}
+      {{ $message['important'] ? 'alert-important' : '' }}"
+           role="alert">
+        @if ($message['important'])
+          <button type="button"
+                  class="close"
+                  data-dismiss="alert"
+                  aria-hidden="true"
+          >&times;
+          </button>
+        @endif
 
-      {!! $message['message'] !!}
-    </div>
+        {!! $message['message'] !!}
+      </div>
+    @endif
   @endif
 @endforeach
 
diff --git a/resources/views/layouts/default/flash/message.blade.php b/resources/views/layouts/default/flash/message.blade.php
index fa805a80..e8f245c9 100644
--- a/resources/views/layouts/default/flash/message.blade.php
+++ b/resources/views/layouts/default/flash/message.blade.php
@@ -1,26 +1,27 @@
 @foreach (collect(session('flash_notification', collect()))->toArray() as $message)
-  @if ($message['overlay'])
-    @include('flash::modal', [
-        'modalClass' => 'flash-modal',
-        'title'      => $message['title'],
-        'body'       => $message['message']
-    ])
+  @if (is_string($message))
+    <div class="alert alert-error">{!! $message !!}</div>
   @else
-    <div class="alert
-                    alert-{{ $message['level'] }}
-    {{ $message['important'] ? 'alert-important' : '' }}"
-         role="alert">
-      @if ($message['important'])
-        <button type="button"
-                class="close"
-                data-dismiss="alert"
-                aria-hidden="true"
-        >&times;
-        </button>
-      @endif
+    @if ($message['overlay'])
+      @include('flash::modal', [
+          'modalClass' => 'flash-modal',
+          'title'      => $message['title'],
+          'body'       => $message['message']
+      ])
+    @else
+      <div class="alert alert-{{ $message['level'] }}
+           {{ $message['important'] ? 'alert-important' : '' }}"
+           role="alert">
+        @if ($message['important'])
+          <button type="button"
+                  class="close"
+                  data-dismiss="alert"
+                  aria-hidden="true">&times;</button>
+        @endif
 
-      {!! $message['message'] !!}
-    </div>
+        {!! $message['message'] !!}
+      </div>
+    @endif
   @endif
 @endforeach