diff options
| author | Thomas Willingham <founder@kakste.com> | 2012-04-02 00:29:27 +0100 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2012-04-02 00:29:27 +0100 |
| commit | 210586eaed18afc4d9ff613ee8f1ea0acdec621a (patch) | |
| tree | 49c8e91f210815eeccd6925457664f39380f0a82 /database.sql | |
| parent | 8406803473773404b18b95c709da0b8f5da59d3c (diff) | |
| parent | 23dc376364b7d8f8e27e3493fe3edbf5cf768a35 (diff) | |
| download | volse-hubzilla-210586eaed18afc4d9ff613ee8f1ea0acdec621a.tar.gz volse-hubzilla-210586eaed18afc4d9ff613ee8f1ea0acdec621a.tar.bz2 volse-hubzilla-210586eaed18afc4d9ff613ee8f1ea0acdec621a.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'database.sql')
| -rwxr-xr-x | database.sql | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/database.sql b/database.sql index 327b482c0..a271e5491 100755 --- a/database.sql +++ b/database.sql @@ -289,9 +289,10 @@ CREATE TABLE IF NOT EXISTS `mail` ( `convid` int(10) unsigned NOT NULL, `title` char(255) NOT NULL, `body` mediumtext NOT NULL, - `seen` tinyint(1) NOT NULL, + `seen` tinyint(1) NOT NULL DEFAULT '0', `reply` tinyint(1) NOT NULL DEFAULT '0', - `replied` tinyint(1) NOT NULL, + `replied` tinyint(1) NOT NULL DEFAULT '0', + `unknown` tinyint(1) NOT NULL DEFAULT '0', `uri` char(255) NOT NULL, `parent-uri` char(255) NOT NULL, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -300,6 +301,7 @@ CREATE TABLE IF NOT EXISTS `mail` ( KEY `guid` (`guid`), KEY `convid` (`convid`), KEY `reply` (`reply`), + KEY `unknown` (`unknown`), KEY `uri` (`uri`), KEY `parent-uri` (`parent-uri`), KEY `created` (`created`) @@ -453,6 +455,8 @@ CREATE TABLE IF NOT EXISTS `user` ( `blockwall` tinyint(1) unsigned NOT NULL DEFAULT '0', `hidewall` tinyint(1) unsigned NOT NULL DEFAULT '0', `blocktags` tinyint(1) unsigned NOT NULL DEFAULT '0', + `unkmail` tinyint(1) unsigned NOT NULL DEFAULT '0', + `cntunkmail` int(11) unsigned NOT NULL DEFAULT '10', `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535', `page-flags` int(11) unsigned NOT NULL DEFAULT '0', `prvnets` tinyint(1) NOT NULL DEFAULT '0', @@ -472,6 +476,8 @@ CREATE TABLE IF NOT EXISTS `user` ( KEY `account_expired` (`account_expired`), KEY `hidewall` (`hidewall`), KEY `blockwall` (`blockwall`), + KEY `unkmail` (`unkmail`), + KEY `cntunkmail` (`cntunkmail`), KEY `blocked` (`blocked`), KEY `verified` (`verified`), KEY `login_date` (`login_date`) |