From f85361dbc5242c76180fa7d57bfe216e11b4ae3f Mon Sep 17 00:00:00 2001
From: slawkens <slawkens@gmail.com>
Date: Fri, 25 Sep 2020 07:49:26 +0200
Subject: [PATCH] Some optimisations in Plugins::installMenus

---
 system/libs/plugins.php | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/system/libs/plugins.php b/system/libs/plugins.php
index 558fb05b..939cff4b 100644
--- a/system/libs/plugins.php
+++ b/system/libs/plugins.php
@@ -413,11 +413,6 @@ class Plugins {
 	{
 		global $db;
 
-		// check if menu table exist (it does not on MyAAC 0.7.0 and lower)
-		if (!$db->hasTable(TABLE_PREFIX . 'menu')) {
-			return;
-		}
-
 		// check if menus already exist
 		$query = $db->query('SELECT `id` FROM `' . TABLE_PREFIX . 'menu` WHERE `template` = ' . $db->quote($templateName) . ' LIMIT 1;');
 		if ($query->rowCount() > 0) {
@@ -431,11 +426,14 @@ class Plugins {
 				$blank = 0;
 
 				if (is_array($link)) {
+					if (isset($link['name'])) {
+						$name = $link['name'];
+					}
 					if (isset($link['color'])) {
 						$color = $link['color'];
 					}
 					if (isset($link['blank'])) {
-						$blank = $link['blank'] === true ? 1 : 0;
+						$blank = $link['blank'] ? 1 : 0;
 					}
 
 					$link = $link['link'];
@@ -447,15 +445,10 @@ class Plugins {
 					'link' => $link,
 					'category' => $category,
 					'ordering' => $i++,
+					'blank' => $blank,
+					'color' => $color,
 				];
 
-				// support for color and blank attributes since 0.8.0
-				if ($db->hasColumn(TABLE_PREFIX . 'menu', 'blank') &&
-					$db->hasColumn(TABLE_PREFIX . 'menu', 'color')) {
-						$insert_array['blank'] = $blank;
-						$insert_array['color'] = $color;
-				}
-
 				$db->insert(TABLE_PREFIX . 'menu', $insert_array);
 			}
 		}