7 files changed, 20 insertions, 12 deletions
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 44661698f2..c63790ad29 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -27,6 +27,7 @@ CREATE TABLE phpbb_attachments (
 	topic_id INTEGER DEFAULT 0 NOT NULL,
 	in_message INTEGER DEFAULT 0 NOT NULL,
 	poster_id INTEGER DEFAULT 0 NOT NULL,
+	is_orphan INTEGER DEFAULT 1 NOT NULL,
 	physical_filename VARCHAR(255) DEFAULT '' NOT NULL,
 	real_filename VARCHAR(255) DEFAULT '' NOT NULL,
 	download_count INTEGER DEFAULT 0 NOT NULL,
@@ -44,7 +45,7 @@ CREATE INDEX phpbb_attachments_filetime ON phpbb_attachments(filetime);;
 CREATE INDEX phpbb_attachments_post_msg_id ON phpbb_attachments(post_msg_id);;
 CREATE INDEX phpbb_attachments_topic_id ON phpbb_attachments(topic_id);;
 CREATE INDEX phpbb_attachments_poster_id ON phpbb_attachments(poster_id);;
-CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments(filesize);;
+CREATE INDEX phpbb_attachments_is_orphan ON phpbb_attachments(is_orphan);;
 
 CREATE GENERATOR phpbb_attachments_gen;;
 SET GENERATOR phpbb_attachments_gen TO 0;;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 14fd6ec084..7a2a8bf26b 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -17,6 +17,7 @@ CREATE TABLE [phpbb_attachments] (
 	[topic_id] [int] DEFAULT (0) NOT NULL ,
 	[in_message] [int] DEFAULT (0) NOT NULL ,
 	[poster_id] [int] DEFAULT (0) NOT NULL ,
+	[is_orphan] [int] DEFAULT (1) NOT NULL ,
 	[physical_filename] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[real_filename] [varchar] (255) DEFAULT ('') NOT NULL ,
 	[download_count] [int] DEFAULT (0) NOT NULL ,
@@ -48,7 +49,7 @@ GO
 CREATE  INDEX [poster_id] ON [phpbb_attachments]([poster_id]) ON [PRIMARY]
 GO
 
-CREATE  INDEX [filesize] ON [phpbb_attachments]([filesize]) ON [PRIMARY]
+CREATE  INDEX [is_orphan] ON [phpbb_attachments]([is_orphan]) ON [PRIMARY]
 GO
 
 
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index 7c266c2010..c3c2be3f4f 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -11,6 +11,7 @@ CREATE TABLE phpbb_attachments (
 	topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	in_message tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	poster_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+	is_orphan tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	physical_filename varchar(255) DEFAULT '' NOT NULL,
 	real_filename varchar(255) DEFAULT '' NOT NULL,
 	download_count mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -25,7 +26,7 @@ CREATE TABLE phpbb_attachments (
 	KEY post_msg_id (post_msg_id),
 	KEY topic_id (topic_id),
 	KEY poster_id (poster_id),
-	KEY filesize (filesize)
+	KEY is_orphan (is_orphan)
 );
 
 
@@ -699,8 +700,8 @@ CREATE TABLE phpbb_smilies (
 	code varchar(50) DEFAULT '' NOT NULL,
 	emotion varchar(50) DEFAULT '' NOT NULL,
 	smiley_url varchar(50) DEFAULT '' NOT NULL,
-	smiley_width tinyint(4) DEFAULT '0' NOT NULL,
-	smiley_height tinyint(4) DEFAULT '0' NOT NULL,
+	smiley_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
+	smiley_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	smiley_order mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	display_on_posting tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	PRIMARY KEY (smiley_id),
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index fc357802f1..6cfb6d5bcd 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -51,6 +51,7 @@ CREATE TABLE phpbb_attachments (
 	topic_id number(8) DEFAULT '0' NOT NULL,
 	in_message number(1) DEFAULT '0' NOT NULL,
 	poster_id number(8) DEFAULT '0' NOT NULL,
+	is_orphan number(1) DEFAULT '1' NOT NULL,
 	physical_filename varchar2(255) DEFAULT '' ,
 	real_filename varchar2(255) DEFAULT '' ,
 	download_count number(8) DEFAULT '0' NOT NULL,
@@ -72,7 +73,7 @@ CREATE INDEX phpbb_attachments_topic_id ON phpbb_attachments (topic_id)
 /
 CREATE INDEX phpbb_attachments_poster_id ON phpbb_attachments (poster_id)
 /
-CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments (filesize)
+CREATE INDEX phpbb_attachments_is_orphan ON phpbb_attachments (is_orphan)
 /
 
 CREATE SEQUENCE phpbb_attachments_seq
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 22b60b361b..89cd209547 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -93,6 +93,7 @@ CREATE TABLE phpbb_attachments (
 	topic_id INT4 DEFAULT '0' NOT NULL CHECK (topic_id >= 0),
 	in_message INT2 DEFAULT '0' NOT NULL CHECK (in_message >= 0),
 	poster_id INT4 DEFAULT '0' NOT NULL CHECK (poster_id >= 0),
+	is_orphan INT2 DEFAULT '1' NOT NULL CHECK (is_orphan >= 0),
 	physical_filename varchar(255) DEFAULT '' NOT NULL,
 	real_filename varchar(255) DEFAULT '' NOT NULL,
 	download_count INT4 DEFAULT '0' NOT NULL CHECK (download_count >= 0),
@@ -109,7 +110,7 @@ CREATE INDEX phpbb_attachments_filetime ON phpbb_attachments (filetime);
 CREATE INDEX phpbb_attachments_post_msg_id ON phpbb_attachments (post_msg_id);
 CREATE INDEX phpbb_attachments_topic_id ON phpbb_attachments (topic_id);
 CREATE INDEX phpbb_attachments_poster_id ON phpbb_attachments (poster_id);
-CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments (filesize);
+CREATE INDEX phpbb_attachments_is_orphan ON phpbb_attachments (is_orphan);
 
 /*
 	Table: 'phpbb_acl_groups'
@@ -923,8 +924,8 @@ CREATE TABLE phpbb_smilies (
 	code varchar(50) DEFAULT '' NOT NULL,
 	emotion varchar(50) DEFAULT '' NOT NULL,
 	smiley_url varchar(50) DEFAULT '' NOT NULL,
-	smiley_width INT2 DEFAULT '0' NOT NULL,
-	smiley_height INT2 DEFAULT '0' NOT NULL,
+	smiley_width INT2 DEFAULT '0' NOT NULL CHECK (smiley_width >= 0),
+	smiley_height INT2 DEFAULT '0' NOT NULL CHECK (smiley_height >= 0),
 	smiley_order INT4 DEFAULT '0' NOT NULL CHECK (smiley_order >= 0),
 	display_on_posting INT2 DEFAULT '1' NOT NULL CHECK (display_on_posting >= 0),
 	PRIMARY KEY (smiley_id)
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 63cd94e5fb..dcf9e39ba3 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -22,11 +22,13 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_name_chars',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_namechange', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_nocensors', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_pm_attach', '0');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_post_links', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_privmsg', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_bbcode', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_flash', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_img', '1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_links', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_pm', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_sig_smilies', '1');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('allow_smilies', '1');
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 5ffbc0efec..0161ef60ad 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -13,6 +13,7 @@ CREATE TABLE phpbb_attachments (
 	topic_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	in_message INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	poster_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	is_orphan INTEGER UNSIGNED NOT NULL DEFAULT '1',
 	physical_filename varchar(255) NOT NULL DEFAULT '',
 	real_filename varchar(255) NOT NULL DEFAULT '',
 	download_count INTEGER UNSIGNED NOT NULL DEFAULT '0',
@@ -28,7 +29,7 @@ CREATE INDEX phpbb_attachments_filetime ON phpbb_attachments (filetime);
 CREATE INDEX phpbb_attachments_post_msg_id ON phpbb_attachments (post_msg_id);
 CREATE INDEX phpbb_attachments_topic_id ON phpbb_attachments (topic_id);
 CREATE INDEX phpbb_attachments_poster_id ON phpbb_attachments (poster_id);
-CREATE INDEX phpbb_attachments_filesize ON phpbb_attachments (filesize);
+CREATE INDEX phpbb_attachments_is_orphan ON phpbb_attachments (is_orphan);
 
 # Table: 'phpbb_acl_groups'
 CREATE TABLE phpbb_acl_groups (
@@ -676,8 +677,8 @@ CREATE TABLE phpbb_smilies (
 	code varchar(50) NOT NULL DEFAULT '',
 	emotion varchar(50) NOT NULL DEFAULT '',
 	smiley_url varchar(50) NOT NULL DEFAULT '',
-	smiley_width tinyint(4) NOT NULL DEFAULT '0',
-	smiley_height tinyint(4) NOT NULL DEFAULT '0',
+	smiley_width INTEGER UNSIGNED NOT NULL DEFAULT '0',
+	smiley_height INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	smiley_order INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	display_on_posting INTEGER UNSIGNED NOT NULL DEFAULT '1'
 );