2 files changed, 11 insertions, 9 deletions
diff --git a/phpBB/install/schemas/mysql_basic.sql b/phpBB/install/schemas/mysql_basic.sql
index ff20ff8703..d380537f20 100644
--- a/phpBB/install/schemas/mysql_basic.sql
+++ b/phpBB/install/schemas/mysql_basic.sql
@@ -26,6 +26,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_forum_notify
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_local','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_remote','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_avatar_upload','0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_nocensors','0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style','1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat','D M d, Y g:i a');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('board_timezone','0');
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 39907f3d54..c28343c447 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -838,7 +838,6 @@ CREATE TABLE phpbb_users (
    user_lastpage varchar(100) DEFAULT '' NOT NULL,
    user_karma tinyint(1) DEFAULT '3' NOT NULL, 
    user_min_karma tinyint(1) DEFAULT '3' NOT NULL, 
-   user_startpage varchar(100) DEFAULT '',
    user_colour varchar(6) DEFAULT '' NOT NULL,
    user_posts mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    user_lang varchar(30) DEFAULT '' NOT NULL,
@@ -847,17 +846,19 @@ CREATE TABLE phpbb_users (
    user_dateformat varchar(15) DEFAULT 'd M Y H:i' NOT NULL,
    user_style tinyint(4) DEFAULT '0' NOT NULL,
    user_rank int(11) DEFAULT '0',
-   user_new_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
-   user_unread_privmsg smallint(5) UNSIGNED DEFAULT '0' NOT NULL,
+   user_new_privmsg tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
+   user_unread_privmsg tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
    user_last_privmsg int(11) DEFAULT '0' NOT NULL,
    user_emailtime int(11) DEFAULT '0' NOT NULL,
-   user_sortby_type varchar(1) DEFAULT 'l' NOT NULL,
-   user_sortby_dir varchar(1) DEFAULT 'd' NOT NULL,
-   user_show_days tinyint(1) DEFAULT '0' NOT NULL,
-   user_viewemail tinyint(1) DEFAULT '1' NOT NULL,
+   user_sortby_type varchar(1) DEFAULT '' NOT NULL,
+   user_sortby_dir varchar(1) DEFAULT '' NOT NULL,
+   user_show_days tinyint(1) DEFAULT '' NOT NULL,
+   user_viewimg tinyint(1) DEFAULT '1' NOT NULL,
+   user_viewflash tinyint(1) DEFAULT '1' NOT NULL,
+   user_viewsmilies tinyint(1) DEFAULT '1' NOT NULL,
    user_viewsigs tinyint(1) DEFAULT '1' NOT NULL,
    user_viewavatars tinyint(1) DEFAULT '1' NOT NULL,
-   user_viewimg tinyint(1) DEFAULT '1' NOT NULL,
+   user_viewcensors tinyint(1) DEFAULT '1' NOT NULL,
    user_attachsig tinyint(1) DEFAULT '1' NOT NULL,
    user_allowhtml tinyint(1) DEFAULT '1' NOT NULL,
    user_allowbbcode tinyint(1) DEFAULT '1' NOT NULL,
@@ -884,7 +885,7 @@ CREATE TABLE phpbb_users (
    user_website varchar(100) DEFAULT '' NOT NULL,
    user_actkey varchar(32) DEFAULT '' NOT NULL,
    user_newpasswd varchar(32) DEFAULT '' NOT NULL,
-   user_occ varchar(100) DEFAULT '' NOT NULL,
+   user_occ varchar(255) DEFAULT '' NOT NULL,
    user_interests varchar(255) DEFAULT '' NOT NULL,
    PRIMARY KEY (user_id)
 );