瀏覽代碼

Upgrade - Menu & Permission Defaults: Mitigate PHP 8.x warnings.

fusionate 1 年之前
父節點
當前提交
932ad69667
共有 2 個文件被更改,包括 5 次插入1 次删除
  1. 3 1
      core/menu/menu_restore_default.php
  2. 2 0
      core/upgrade/index.php

+ 3 - 1
core/menu/menu_restore_default.php

@@ -68,7 +68,9 @@
 //redirect
 //redirect
 	if(!defined('STDIN')) {
 	if(!defined('STDIN')) {
 		//show a message to the user
 		//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));
 		header("Location: ".PROJECT_PATH."/core/menu/menu_edit.php?id=".urlencode($menu_uuid));
 		return;
 		return;
 	}
 	}

+ 2 - 0
core/upgrade/index.php

@@ -142,6 +142,7 @@
 			$included = true;
 			$included = true;
 			require_once("core/menu/menu_restore_default.php");
 			require_once("core/menu/menu_restore_default.php");
 			unset($sel_menu);
 			unset($sel_menu);
+			$text = $language->get(null, '/core/upgrade');
 			message::add($text['message-upgrade_menu'], null, $message_timeout);
 			message::add($text['message-upgrade_menu'], null, $message_timeout);
 		}
 		}
 
 
@@ -149,6 +150,7 @@
 		if (!empty($action["permission_defaults"]) && permission_exists("group_edit")) {
 		if (!empty($action["permission_defaults"]) && permission_exists("group_edit")) {
 			$included = true;
 			$included = true;
 			require_once("core/groups/permissions_default.php");
 			require_once("core/groups/permissions_default.php");
+			$text = $language->get(null, '/core/upgrade');
 			message::add($text['message-upgrade_permissions'], null, $message_timeout);
 			message::add($text['message-upgrade_permissions'], null, $message_timeout);
 		}
 		}