3 files changed, 19 insertions, 17 deletions
diff --git a/phpBB/db/mysql_basic.sql b/phpBB/db/mysql_basic.sql
index 1299c3611b..77792733f8 100644
--- a/phpBB/db/mysql_basic.sql
+++ b/phpBB/db/mysql_basic.sql
@@ -38,7 +38,7 @@ INSERT INTO phpbb_auth_forums (forum_id, auth_view, auth_read, auth_post, auth_r
 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);
+INSERT INTO phpbb_topics VALUES(1, 1, 'Demo Topic', 1, NOW(), 0, 0, 0, 0, 0, 1);
 
 # -- Demo Post
 INSERT INTO phpbb_posts VALUES(1, 1, 1, 1, NOW(), '127.0.0.1' , LEFT(MD5('42'), 10));
diff --git a/phpBB/db/mysql_schema.sql b/phpBB/db/mysql_schema.sql
index fb2897a4aa..bf6ea64c2c 100644
--- a/phpBB/db/mysql_schema.sql
+++ b/phpBB/db/mysql_schema.sql
@@ -18,10 +18,10 @@ 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_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,
    auth_mod tinyint(1) DEFAULT '0' NOT NULL,
    auth_admin tinyint(1) DEFAULT '0' NOT NULL
@@ -40,10 +40,10 @@ 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_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_vote tinyint(4) DEFAULT '0' NOT NULL,
    auth_attachments tinyint(4) DEFAULT '0' NOT NULL
 );
 
@@ -125,7 +125,7 @@ CREATE TABLE phpbb_config (
    email_from varchar(100),
    flood_interval int(4) NOT NULL,
    avatar_filesize int(11) DEFAULT '6144' NOT NULL,
-   avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL, 
+   avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL,
    default_theme int(11) DEFAULT '1' NOT NULL,
    default_lang varchar(255),
    default_dateformat varchar(14) DEFAULT 'd M Y H:i' NOT NULL,
@@ -273,8 +273,8 @@ CREATE TABLE phpbb_session (
    session_id char(32) DEFAULT '' NOT NULL,
    session_user_id int(11) DEFAULT '0' NOT NULL,
    session_start int(11) DEFAULT '0' NOT NULL,
-   session_time int(11) DEFAULT '0' NOT NULL, 
-   session_last_visit int(11) DEFAULT '0' NOT NULL, 
+   session_time int(11) DEFAULT '0' NOT NULL,
+   session_last_visit int(11) DEFAULT '0' NOT NULL,
    session_ip char(8) DEFAULT '0' NOT NULL,
    session_page int(11) DEFAULT '0' NOT NULL,
    session_logged_in tinyint(1) DEFAULT '0' NOT NULL,
@@ -407,6 +407,7 @@ CREATE TABLE phpbb_topics (
    topic_views int(10) DEFAULT '0' NOT NULL,
    topic_replies int(11) DEFAULT '0' NOT NULL,
    topic_status tinyint(3) DEFAULT '0' NOT NULL,
+   topic_type tinyint(3) DEFAULT '0' NOT NULL,
    topic_notify tinyint(3) DEFAULT '0',
    topic_last_post_id int(11) DEFAULT '0' NOT NULL,
    PRIMARY KEY (topic_id),
diff --git a/phpBB/db/postgres_schema.sql b/phpBB/db/postgres_schema.sql
index 5863deac54..06e79697af 100644
--- a/phpBB/db/postgres_schema.sql
+++ b/phpBB/db/postgres_schema.sql
@@ -34,7 +34,7 @@ CREATE TABLE phpbb_auth_forums (
    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_vote int2 DEFAULT '0' NOT NULL,
    auth_attachments int2 DEFAULT '0' NOT NULL
 );
 
@@ -53,8 +53,8 @@ CREATE TABLE phpbb_auth_access (
    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_votecreate int2 DEFAULT '0' NOT NULL,
+   auth_attachments int2 DEFAULT '0' NOT NULL,
    auth_vote int2 DEFAULT '0' NOT NULL,
    auth_mod int2 DEFAULT '0' NOT NULL,
    auth_admin int2 DEFAULT '0' NOT NULL
@@ -141,7 +141,7 @@ CREATE TABLE phpbb_config (
    system_timezone int4 NOT NULL,
    sys_template varchar(50) NOT NULL,
    avatar_filesize int4 DEFAULT '6144' NOT NULL,
-   avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL, 
+   avatar_path varchar(255) DEFAULT 'images/avatars' NOT NULL,
    override_themes int2 NOT NULL,
    flood_interval int NOT NULL,
    selected int2 NOT NULL,
@@ -286,8 +286,8 @@ CREATE TABLE phpbb_session (
    session_id char(32) DEFAULT '0' NOT NULL,
    session_user_id int4 DEFAULT '0' NOT NULL,
    session_start int4 DEFAULT '0' NOT NULL,
-   session_time int4 DEFAULT '0' NOT NULL, 
-   session_last_visit int4 DEFAULT '0' NOT NULL, 
+   session_time int4 DEFAULT '0' NOT NULL,
+   session_last_visit int4 DEFAULT '0' NOT NULL,
    session_ip char(8) DEFAULT '0' NOT NULL,
    session_page int4 DEFAULT '0' NOT NULL,
    session_logged_in int2 DEFAULT '0' NOT NULL,
@@ -404,6 +404,7 @@ CREATE TABLE phpbb_topics (
    topic_replies int4 DEFAULT '0' NOT NULL,
    forum_id int4 DEFAULT '0' NOT NULL,
    topic_status int2 DEFAULT '0' NOT NULL,
+   topic_type int2 DEFAULT '0' NOT NULL,
    topic_notify int2 DEFAULT '0',
    topic_last_post_id int4 DEFAULT '0' NOT NULL,
    CONSTRAINT phpbb_topics_pkey PRIMARY KEY (topic_id)