4 files changed, 10 insertions, 6 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index a84136388c..e85fe1810d 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1100,6 +1100,10 @@ function database_update_info()
 			'change_columns'	=> array(
 				GROUPS_TABLE		=> array(
 					'group_legend'		=> array('UINT', 0),
+					'group_avatar_type'		=> array('VCHAR:32', 0),
+				),
+				USERS_TABLE		=> array(
+					'user_avatar_type'		=> array('VCHAR:32', 0),
 				),
 			),
 			'drop_columns'      => array(
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 51565ef2d4..68cdca57f8 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -445,7 +445,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid VARCHAR(8) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	group_display INTEGER DEFAULT 0 NOT NULL,
 	group_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	group_avatar_type INTEGER DEFAULT 0 NOT NULL,
+	group_avatar_type VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	group_avatar_width INTEGER DEFAULT 0 NOT NULL,
 	group_avatar_height INTEGER DEFAULT 0 NOT NULL,
 	group_rank INTEGER DEFAULT 0 NOT NULL,
@@ -1269,7 +1269,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail INTEGER DEFAULT 1 NOT NULL,
 	user_options INTEGER DEFAULT 230271 NOT NULL,
 	user_avatar VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
-	user_avatar_type INTEGER DEFAULT 0 NOT NULL,
+	user_avatar_type VARCHAR(32) CHARACTER SET NONE DEFAULT '' NOT NULL,
 	user_avatar_width INTEGER DEFAULT 0 NOT NULL,
 	user_avatar_height INTEGER DEFAULT 0 NOT NULL,
 	user_sig BLOB SUB_TYPE TEXT CHARACTER SET UTF8 DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 2c78dd009f..2cf60e9f02 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -553,7 +553,7 @@ CREATE TABLE [phpbb_groups] (
 	[group_desc_uid] [varchar] (8) DEFAULT ('') NOT NULL ,
 	[group_display] [int] DEFAULT (0) NOT NULL ,
 	[group_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[group_avatar_type] [int] DEFAULT (0) NOT NULL ,
+	[group_avatar_type] [varchar] (32) DEFAULT ('') NOT NULL ,
 	[group_avatar_width] [int] DEFAULT (0) NOT NULL ,
 	[group_avatar_height] [int] DEFAULT (0) NOT NULL ,
 	[group_rank] [int] DEFAULT (0) NOT NULL ,
@@ -1553,7 +1553,7 @@ CREATE TABLE [phpbb_users] (
 	[user_allow_massemail] [int] DEFAULT (1) NOT NULL ,
 	[user_options] [int] DEFAULT (230271) NOT NULL ,
 	[user_avatar] [varchar] (255) DEFAULT ('') NOT NULL ,
-	[user_avatar_type] [int] DEFAULT (0) NOT NULL ,
+	[user_avatar_type] [varchar] (32) DEFAULT ('') NOT NULL ,
 	[user_avatar_width] [int] DEFAULT (0) NOT NULL ,
 	[user_avatar_height] [int] DEFAULT (0) NOT NULL ,
 	[user_sig] [text] DEFAULT ('') NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index d19f1930d0..2515d07b8e 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -317,7 +317,7 @@ CREATE TABLE phpbb_groups (
 	group_desc_uid varbinary(8) DEFAULT '' NOT NULL,
 	group_display tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar varbinary(255) DEFAULT '' NOT NULL,
-	group_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
+	group_avatar_type varbinary(32) DEFAULT '' NOT NULL,
 	group_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	group_rank mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
@@ -917,7 +917,7 @@ CREATE TABLE phpbb_users (
 	user_allow_massemail tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
 	user_options int(11) UNSIGNED DEFAULT '230271' NOT NULL,
 	user_avatar varbinary(255) DEFAULT '' NOT NULL,
-	user_avatar_type tinyint(2) DEFAULT '0' NOT NULL,
+	user_avatar_type varbinary(32) DEFAULT '' NOT NULL,
 	user_avatar_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_avatar_height smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
 	user_sig mediumblob NOT NULL,