diff --git a/install/includes/schema.sql b/install/includes/schema.sql index 87c754d9..3c899a07 100644 --- a/install/includes/schema.sql +++ b/install/includes/schema.sql @@ -147,6 +147,8 @@ CREATE TABLE `myaac_menu` `template` VARCHAR(255) NOT NULL, `name` VARCHAR(255) NOT NULL, `link` VARCHAR(255) NOT NULL, + `blank` TINYINT(1) NOT NULL DEFAULT 0, + `color` CHAR(6) NOT NULL DEFAULT '', `category` INT(11) NOT NULL DEFAULT 1, `ordering` INT(11) NOT NULL DEFAULT 0, `enabled` INT(1) NOT NULL DEFAULT 1, diff --git a/system/migrations/23.php b/system/migrations/23.php index ee1e33f0..3661bd9a 100644 --- a/system/migrations/23.php +++ b/system/migrations/23.php @@ -4,4 +4,4 @@ if(!$db->hasColumn(TABLE_PREFIX . 'menu', 'blank')) $db->query('ALTER TABLE `' . TABLE_PREFIX . 'menu` ADD `blank` TINYINT(1) NOT NULL DEFAULT 0 AFTER `link`;'); if(!$db->hasColumn(TABLE_PREFIX . 'menu', 'color')) - $db->query('ALTER TABLE `' . TABLE_PREFIX . 'menu` ADD `color` CHAR(6) NOT NULL DEFAULT "ffffff" AFTER `blank`;'); \ No newline at end of file + $db->query("ALTER TABLE `' . TABLE_PREFIX . 'menu` ADD `color` CHAR(6) NOT NULL DEFAULT '' AFTER `blank`;"); \ No newline at end of file diff --git a/system/template.php b/system/template.php index 6fc3c166..8f08b869 100644 --- a/system/template.php +++ b/system/template.php @@ -104,7 +104,7 @@ function get_template_menus() { $query = $db->query('SELECT `name`, `link`, `blank`, `color`, `category` FROM `' . TABLE_PREFIX . 'menu` WHERE `template` = ' . $db->quote($template_name) . ' ORDER BY `category`, `ordering` ASC'); foreach($query->fetchAll() as $menu) { $link_full = strpos(trim($menu['link']), 'http') === 0 ? $menu['link'] : getLink($menu['link']); - $menus[$menu['category']][] = array('name' => $menu['name'], 'link' => $menu['link'], 'link_full' => $link_full, 'blank' => $menu['blank'] == 1, 'color' => '#' . $menu['color']); + $menus[$menu['category']][] = array('name' => $menu['name'], 'link' => $menu['link'], 'link_full' => $link_full, 'blank' => $menu['blank'] == 1, 'color' => $menu['color']); } $new_menus = array(); diff --git a/templates/kathrine/template.php b/templates/kathrine/template.php index 38c94df0..cb80421d 100644 --- a/templates/kathrine/template.php +++ b/templates/kathrine/template.php @@ -80,6 +80,8 @@ defined('MYAAC') or die('Direct access not allowed!');