diff options
| author | Thomas Willingham <founder@kakste.com> | 2014-01-15 23:01:02 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2014-01-15 23:01:02 +0000 |
| commit | 9f66e5aef325666a0fa6e3f035eaa2c3b35b5b00 (patch) | |
| tree | c4b261f1cbbf85d4153ecee64fe285cc5aa38ec9 /install | |
| parent | 9addc83520adada78ad339edd6abe666f65b7059 (diff) | |
| parent | 762a5432494711bf481943a0dee72cf65f7a04bb (diff) | |
| download | volse-hubzilla-9f66e5aef325666a0fa6e3f035eaa2c3b35b5b00.tar.gz volse-hubzilla-9f66e5aef325666a0fa6e3f035eaa2c3b35b5b00.tar.bz2 volse-hubzilla-9f66e5aef325666a0fa6e3f035eaa2c3b35b5b00.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'install')
| -rw-r--r-- | install/database.sql | 4 | ||||
| -rw-r--r-- | install/update.php | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/install/database.sql b/install/database.sql index d28128795..597124566 100644 --- a/install/database.sql +++ b/install/database.sql @@ -536,9 +536,11 @@ CREATE TABLE IF NOT EXISTS `menu` ( `menu_channel_id` int(10) unsigned NOT NULL DEFAULT '0', `menu_name` char(255) NOT NULL DEFAULT '', `menu_desc` char(255) NOT NULL DEFAULT '', + `menu_flags` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`menu_id`), KEY `menu_channel_id` (`menu_channel_id`), - KEY `menu_name` (`menu_name`) + KEY `menu_name` (`menu_name`), + KEY `menu_flags` (`menu_flags`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `menu_item` ( diff --git a/install/update.php b/install/update.php index 3e04df51b..022d7f0dc 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1090 ); +define( 'UPDATE_VERSION' , 1091 ); /** * @@ -986,3 +986,11 @@ ADD INDEX ( `creator` ) "); } +function update_r1090() { + $r = q("ALTER TABLE `menu` ADD `menu_flags` INT NOT NULL DEFAULT '0', +ADD INDEX ( `menu_flags` )"); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + |