diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-29 22:06:16 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-29 22:06:16 -0400 |
| commit | 34eb843fb486b9487f02553c1b791892bb7615fc (patch) | |
| tree | 0cc1e343310753e018c0fb36f9848f227d5eb35a /database.sql | |
| parent | ecd1dab373a1fccb1663023f6515ed148475079d (diff) | |
| parent | def6f0b408680c4e5f209890bbf1ad6bf40b5add (diff) | |
| download | volse-hubzilla-34eb843fb486b9487f02553c1b791892bb7615fc.tar.gz volse-hubzilla-34eb843fb486b9487f02553c1b791892bb7615fc.tar.bz2 volse-hubzilla-34eb843fb486b9487f02553c1b791892bb7615fc.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
the heart should really be red.
fix location change notification
enhanced profile reporting for single values
add db field for removed account, which will also be the first test of update error checking
toggle to archive unfriends, though render them useless
indicate successful updates
diabook-themes: small fix
diabook-themes: bug/css-fixes
some constants for the db update failure possibilities
bring back the email and logging of update failures, but without the transactions
* master:
Diffstat (limited to 'database.sql')
| -rw-r--r-- | database.sql | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/database.sql b/database.sql index 78b26922b..80a9197fa 100644 --- a/database.sql +++ b/database.sql @@ -1019,6 +1019,7 @@ CREATE TABLE IF NOT EXISTS `user` ( `pwdreset` char(255) NOT NULL, `maxreq` int(11) NOT NULL DEFAULT '10', `expire` int(10) unsigned NOT NULL DEFAULT '0', + `account_removed` tinyint(1) NOT NULL DEFAULT '0', `account_expired` tinyint(1) NOT NULL DEFAULT '0', `account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', @@ -1036,7 +1037,8 @@ CREATE TABLE IF NOT EXISTS `user` ( KEY `blocked` (`blocked`), KEY `verified` (`verified`), KEY `unkmail` (`unkmail`), - KEY `cntunkmail` (`cntunkmail`) + KEY `cntunkmail` (`cntunkmail`), + KEY `account_removed` (`account_removed`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- |