3 files changed, 13 insertions, 5 deletions
diff --git a/database/database.mysql b/database/database.mysql
index 5515af7b2..ea8d8b454 100644
--- a/database/database.mysql
+++ b/database/database.mysql
@@ -268,8 +268,7 @@ CREATE TABLE menu (
   path varchar(255) NOT NULL default '',
   title varchar(255) NOT NULL default '',
   weight tinyint(4) NOT NULL default '0',
-  visibility int(1) unsigned NOT NULL default '0',
-  status int(1) unsigned NOT NULL default '0',
+  type int(2) unsigned NOT NULL default '0',
   PRIMARY KEY  (mid)
 ) TYPE=MyISAM;
 
diff --git a/database/database.pgsql b/database/database.pgsql
index 3b7812599..b91616ea6 100644
--- a/database/database.pgsql
+++ b/database/database.pgsql
@@ -268,8 +268,7 @@ CREATE TABLE menu (
   path varchar(255) NOT NULL default '',
   title varchar(255) NOT NULL default '',
   weight smallint NOT NULL default '0',
-  visibility smallint NOT NULL default '0',
-  status smallint NOT NULL default '0',
+  type smallint NOT NULL default '0',
   PRIMARY KEY  (mid)
 );
 
diff --git a/database/updates.inc b/database/updates.inc
index d0a1b8424..c6c7f00e0 100644
--- a/database/updates.inc
+++ b/database/updates.inc
@@ -58,7 +58,8 @@ $sql_updates = array(
   "2004-04-21" => "update_84",
   "2004-04-27" => "update_85",
   "2004-05-10" => "update_86",
-  "2004-05-18" => "update_87"
+  "2004-05-18" => "update_87",
+  "2004-06-11" => "update_88"
 );
 
 function update_32() {
@@ -1093,6 +1094,15 @@ function update_87() {
   return $ret;
 }
 
+function update_88() {
+  $ret = array();
+  $ret[] = update_sql("ALTER TABLE {menu} DROP status");
+  $ret[] = update_sql("ALTER TABLE {menu} DROP visibility");
+  $ret[] = update_sql("ALTER TABLE {menu} ADD type INT(2) UNSIGNED DEFAULT '0' NOT NULL");
+  $ret[] = update_sql("DELETE FROM {menu}");
+  return $ret;
+}
+
 function update_sql($sql) {
   $edit = $_POST["edit"];
   $result = db_query($sql);