From b369fad190b2091b7e071d83e40e207b991ad881 Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Mon, 13 May 2024 12:49:29 -0600
Subject: [PATCH] Upgrade - Menu & Permission Defaults: Mitigate PHP 8.x
 warnings.

---
 core/menu/menu_restore_default.php | 4 +++-
 core/upgrade/index.php             | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/menu/menu_restore_default.php b/core/menu/menu_restore_default.php
index 10901bc9ce..7ae406129e 100644
--- a/core/menu/menu_restore_default.php
+++ b/core/menu/menu_restore_default.php
@@ -68,7 +68,9 @@
 //redirect
 	if(!defined('STDIN')) {
 		//show a message to the user
-		message::add($text['message-restore']);
+		if (empty($included) || !$included) {
+			message::add($text['message-restore']);
+		}
 		header("Location: ".PROJECT_PATH."/core/menu/menu_edit.php?id=".urlencode($menu_uuid));
 		return;
 	}
diff --git a/core/upgrade/index.php b/core/upgrade/index.php
index 4016d9a363..f87e3ac1dd 100644
--- a/core/upgrade/index.php
+++ b/core/upgrade/index.php
@@ -142,6 +142,7 @@
 			$included = true;
 			require_once("core/menu/menu_restore_default.php");
 			unset($sel_menu);
+			$text = $language->get(null, '/core/upgrade');
 			message::add($text['message-upgrade_menu'], null, $message_timeout);
 		}
 
@@ -149,6 +150,7 @@
 		if (!empty($action["permission_defaults"]) && permission_exists("group_edit")) {
 			$included = true;
 			require_once("core/groups/permissions_default.php");
+			$text = $language->get(null, '/core/upgrade');
 			message::add($text['message-upgrade_permissions'], null, $message_timeout);
 		}