diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-03-28 21:16:25 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-03-28 21:16:25 +0000 |
| commit | fbb4dc69c6789a04f8464afba4ea625feb880731 (patch) | |
| tree | 47c746b9115d30c4ac3e686022fa497238ac68eb /install/database.sql | |
| parent | c8852d455e77624baf9e6ac852c1176f45462e70 (diff) | |
| parent | d0bf45972135bde9ac39a06c6fa5eb64d075a225 (diff) | |
| download | volse-hubzilla-fbb4dc69c6789a04f8464afba4ea625feb880731.tar.gz volse-hubzilla-fbb4dc69c6789a04f8464afba4ea625feb880731.tar.bz2 volse-hubzilla-fbb4dc69c6789a04f8464afba4ea625feb880731.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'install/database.sql')
| -rw-r--r-- | install/database.sql | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/install/database.sql b/install/database.sql index 7dbaff7ea..c989439fa 100644 --- a/install/database.sql +++ b/install/database.sql @@ -160,7 +160,7 @@ CREATE TABLE IF NOT EXISTS `channel` ( `channel_max_friend_req` int(10) unsigned NOT NULL DEFAULT '10', `channel_expire_days` int(11) NOT NULL DEFAULT '0', `channel_passwd_reset` char(255) NOT NULL DEFAULT '', - `channel_default_gid` int(10) unsigned NOT NULL DEFAULT '0', + `channel_default_group` char(255) NOT NULL DEFAULT '', `channel_allow_cid` mediumtext NOT NULL, `channel_allow_gid` mediumtext NOT NULL, `channel_deny_cid` mediumtext NOT NULL, @@ -537,10 +537,10 @@ CREATE TABLE IF NOT EXISTS `mail` ( CREATE TABLE IF NOT EXISTS `manage` ( `id` int(11) NOT NULL AUTO_INCREMENT, `uid` int(11) NOT NULL, - `mid` int(11) NOT NULL, + `xchan` char(255) NOT NULL DEFAULT '', PRIMARY KEY (`id`), KEY `uid` (`uid`), - KEY `mid` (`mid`) + KEY `xchan` (`xchan`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `menu` ( |