From e7e9c57552d8ca414632df5c8c6c1223b711f953 Mon Sep 17 00:00:00 2001
From: Darko Gjorgjijoski <dg@darkog.com>
Date: Thu, 8 Feb 2024 01:54:05 +0100
Subject: [PATCH] Improvements to the menu generation, add safety checks

---
 app/Traits/GeneratesMenuTrait.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Traits/GeneratesMenuTrait.php b/app/Traits/GeneratesMenuTrait.php
index 2cc24c51..72e6620e 100644
--- a/app/Traits/GeneratesMenuTrait.php
+++ b/app/Traits/GeneratesMenuTrait.php
@@ -6,11 +6,14 @@ trait GeneratesMenuTrait
 {
     public function generateMenu($key, $user)
     {
-        $menu = [];
+        $new_items = [];
 
-        foreach (\Menu::get($key)->items->toArray() as $data) {
+        $menu =  \Menu::get($key);
+        $items = $menu ? $menu->items->toArray() : [];
+
+        foreach ($items as $data) {
             if ($user->checkAccess($data)) {
-                $menu[] = [
+                $new_items[] = [
                     'title' => $data->title,
                     'link' => $data->link->path['url'],
                     'icon' => $data->data['icon'],
@@ -20,6 +23,6 @@ trait GeneratesMenuTrait
             }
         }
 
-        return $menu;
+        return $new_items;
     }
 }