3 files changed, 21 insertions, 14 deletions
diff --git a/phpBB/db/mysql_basic.sql b/phpBB/db/mysql_basic.sql
index 36d41890e9..1299c3611b 100644
--- a/phpBB/db/mysql_basic.sql
+++ b/phpBB/db/mysql_basic.sql
@@ -32,10 +32,10 @@ INSERT INTO phpbb_user_group (group_id, user_id) VALUES (1, 1);
 INSERT INTO phpbb_user_group (group_id, user_id) VALUES (2, 2);
 
 # -- Forum Access (Open access to ALL)
-INSERT INTO phpbb_auth_forums (forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_votecreate, auth_vote) VALUES (1, 0, 0, 0, 0, 0, 0, 0, 0);
+INSERT INTO phpbb_auth_forums (forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_votecreate, auth_vote) VALUES (1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
 
 # -- User Access (admin is set as a moderator of the created forum)
-INSERT INTO phpbb_auth_access (group_id, forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_votecreate, auth_vote, auth_mod) VALUES (2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1);
+INSERT INTO phpbb_auth_access (group_id, forum_id, auth_view, auth_read, auth_post, auth_reply, auth_edit, auth_delete, auth_announce, auth_sticky, auth_votecreate, auth_vote, auth_mod) VALUES (2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1);
 
 # -- Demo Topic
 INSERT INTO phpbb_topics VALUES(1, 1, 'Demo Topic', 1, NOW(), 0, 0, 0, 0, 1);
diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql
index da03a4f243..fb2897a4aa 100644
--- a/phpBB/db/mysql_schema.sql
+++ b/phpBB/db/mysql_schema.sql
@@ -18,6 +18,8 @@ CREATE TABLE phpbb_auth_access (
    auth_reply tinyint(1) DEFAULT '0' NOT NULL,
    auth_edit tinyint(1) DEFAULT '0' NOT NULL,
    auth_delete tinyint(1) DEFAULT '0' NOT NULL,
+   auth_announce tinyint(1) DEFAULT '0' NOT NULL, 
+   auth_sticky tinyint(1) DEFAULT '0' NOT NULL, 
    auth_votecreate tinyint(1) DEFAULT '0' NOT NULL, 
    auth_attachments tinyint(1) DEFAULT '0' NOT NULL, 
    auth_vote tinyint(1) DEFAULT '0' NOT NULL,
@@ -38,6 +40,8 @@ CREATE TABLE phpbb_auth_forums (
    auth_reply tinyint(4) DEFAULT '0' NOT NULL,
    auth_edit tinyint(4) DEFAULT '0' NOT NULL,
    auth_delete tinyint(4) DEFAULT '0' NOT NULL,
+   auth_announce tinyint(4) DEFAULT '0' NOT NULL, 
+   auth_sticky tinyint(4) DEFAULT '0' NOT NULL, 
    auth_votecreate tinyint(4) DEFAULT '0' NOT NULL,
    auth_vote tinyint(4) DEFAULT '0' NOT NULL, 
    auth_attachments tinyint(4) DEFAULT '0' NOT NULL
@@ -421,14 +425,20 @@ CREATE TABLE phpbb_users (
    user_id int(11) NOT NULL auto_increment,
    user_active tinyint(4),
    username varchar(40) NOT NULL,
-   user_level int(11) DEFAULT '0',
-   user_regdate int(11) DEFAULT '0' NOT NULL,
    user_password varchar(32) NOT NULL,
    user_autologin_key varchar(32),
-   user_template varchar(50),
-   user_lang varchar(255),
+   user_level tinyint(4) DEFAULT '0',
    user_timezone int(11) DEFAULT '0' NOT NULL,
    user_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
+   user_template varchar(50),
+   user_theme int(11),
+   user_lang varchar(255),
+   user_viewemail tinyint(1),
+   user_attachsig tinyint(1),
+   user_allowhtml tinyint(1),
+   user_allowbbcode tinyint(1),
+   user_allowsmile tinyint(1),
+   user_regdate int(11) DEFAULT '0' NOT NULL,
    user_rank int(11) DEFAULT '0',
    user_avatar varchar(100),
    user_email varchar(255),
@@ -438,21 +448,14 @@ CREATE TABLE phpbb_users (
    user_from varchar(100),
    user_interests varchar(255),
    user_sig varchar(255),
-   user_theme int(11),
    user_aim varchar(255),
    user_yim varchar(255),
    user_msnm varchar(255),
    user_posts int(11) DEFAULT '0',
-   user_viewemail tinyint(3),
-   user_attachsig tinyint(3),
-   user_allowhtml tinyint(3),
-   user_allowbbcode tinyint(3),
-   user_allowsmile tinyint(3),
    user_actkey varchar(32),
    user_newpasswd varchar(32),
    user_notify tinyint(3),
-   PRIMARY KEY (user_id),
-   KEY user_id (user_id)
+   PRIMARY KEY (user_id)
 );
 
 
diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql
index bf7cd5e450..5863deac54 100644
--- a/phpBB/db/postgres_schema.sql
+++ b/phpBB/db/postgres_schema.sql
@@ -31,6 +31,8 @@ CREATE TABLE phpbb_auth_forums (
    auth_reply int2 DEFAULT '0' NOT NULL,
    auth_edit int2 DEFAULT '0' NOT NULL,
    auth_delete int2 DEFAULT '0' NOT NULL,
+   auth_announce int2 DEFAULT '0' NOT NULL,
+   auth_sticky int2 DEFAULT '0' NOT NULL,
    auth_votecreate int2 DEFAULT '0' NOT NULL,
    auth_vote int2 DEFAULT '0' NOT NULL, 
    auth_attachments int2 DEFAULT '0' NOT NULL
@@ -49,6 +51,8 @@ CREATE TABLE phpbb_auth_access (
    auth_reply int2 DEFAULT '0' NOT NULL,
    auth_edit int2 DEFAULT '0' NOT NULL,
    auth_delete int2 DEFAULT '0' NOT NULL,
+   auth_announce int2 DEFAULT '0' NOT NULL,
+   auth_sticky int2 DEFAULT '0' NOT NULL,
    auth_votecreate int2 DEFAULT '0' NOT NULL, 
    auth_attachments int2 DEFAULT '0' NOT NULL, 
    auth_vote int2 DEFAULT '0' NOT NULL,