8 files changed, 2 insertions, 19 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 6668416c7d..ee8ec90fdf 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -320,16 +320,13 @@ class module
 			'T_IMAGE_PATH'			=> $phpbb_root_path . 'adm/images/',
 
 			'S_CONTENT_DIRECTION' 	=> $lang['DIRECTION'],
-			'S_CONTENT_ENCODING' 	=> $lang['ENCODING'],
+			'S_CONTENT_ENCODING' 	=> 'UTF-8',
 			'S_CONTENT_DIR_LEFT' 	=> $lang['LEFT'],
 			'S_CONTENT_DIR_RIGHT' 	=> $lang['RIGHT'],
 			)
 		);
 
-		if (!empty($lang['ENCODING']))
-		{
-			header('Content-type: text/html; charset: ' . $lang['ENCODING']);
-		}
+		header('Content-type: text/html; charset=UTF-8');
 		header('Cache-Control: private, no-cache="set-cookie"');
 		header('Expires: 0');
 		header('Pragma: no-cache');
diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 10fb3ea574..25dd4dcf33 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -640,7 +640,6 @@ CREATE TABLE phpbb_posts (
 	post_subject BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	post_text BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	post_checksum VARCHAR(32) DEFAULT '' NOT NULL,
-	post_encoding VARCHAR(20) DEFAULT 'iso-8859-1' NOT NULL,
 	post_attachment INTEGER DEFAULT 0 NOT NULL,
 	bbcode_bitfield VARCHAR(252) DEFAULT '' NOT NULL,
 	bbcode_uid VARCHAR(5) DEFAULT '' NOT NULL,
@@ -689,7 +688,6 @@ CREATE TABLE phpbb_privmsgs (
 	message_text BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	message_edit_reason BLOB SUB_TYPE TEXT DEFAULT '' NOT NULL,
 	message_edit_user INTEGER DEFAULT 0 NOT NULL,
-	message_encoding VARCHAR(20) DEFAULT 'iso-8859-1' NOT NULL,
 	message_attachment INTEGER DEFAULT 0 NOT NULL,
 	bbcode_bitfield VARCHAR(252) DEFAULT '' NOT NULL,
 	bbcode_uid VARCHAR(5) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index 64652762d5..5f2f889e57 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -751,7 +751,6 @@ CREATE TABLE [phpbb_posts] (
 	[post_subject] [nvarchar] (1000) DEFAULT ('') NOT NULL ,
 	[post_text] [ntext] DEFAULT ('') NOT NULL ,
 	[post_checksum] [varchar] (32) DEFAULT ('') NOT NULL ,
-	[post_encoding] [varchar] (20) DEFAULT ('iso-8859-1') NOT NULL ,
 	[post_attachment] [int] DEFAULT (0) NOT NULL ,
 	[bbcode_bitfield] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[bbcode_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
@@ -811,7 +810,6 @@ CREATE TABLE [phpbb_privmsgs] (
 	[message_text] [ntext] DEFAULT ('') NOT NULL ,
 	[message_edit_reason] [nvarchar] (3000) DEFAULT ('') NOT NULL ,
 	[message_edit_user] [int] DEFAULT (0) NOT NULL ,
-	[message_encoding] [varchar] (20) DEFAULT ('iso-8859-1') NOT NULL ,
 	[message_attachment] [int] DEFAULT (0) NOT NULL ,
 	[bbcode_bitfield] [varchar] (252) DEFAULT ('') NOT NULL ,
 	[bbcode_uid] [varchar] (5) DEFAULT ('') NOT NULL ,
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index d71cf7c5d9..f2be2243a2 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -438,7 +438,6 @@ CREATE TABLE phpbb_posts (
 	post_subject text DEFAULT '' NOT NULL,
 	post_text mediumtext DEFAULT '' NOT NULL,
 	post_checksum varchar(32) DEFAULT '' NOT NULL,
-	post_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
 	post_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	bbcode_bitfield varchar(252) DEFAULT '' NOT NULL,
 	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
@@ -475,7 +474,6 @@ CREATE TABLE phpbb_privmsgs (
 	message_text mediumtext DEFAULT '' NOT NULL,
 	message_edit_reason text DEFAULT '' NOT NULL,
 	message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	message_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
 	message_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	bbcode_bitfield varchar(252) DEFAULT '' NOT NULL,
 	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 8fda313642..593980ea9b 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -438,7 +438,6 @@ CREATE TABLE phpbb_posts (
 	post_subject text DEFAULT '' NOT NULL,
 	post_text mediumtext DEFAULT '' NOT NULL,
 	post_checksum varchar(32) DEFAULT '' NOT NULL,
-	post_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
 	post_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	bbcode_bitfield varchar(252) DEFAULT '' NOT NULL,
 	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
@@ -475,7 +474,6 @@ CREATE TABLE phpbb_privmsgs (
 	message_text mediumtext DEFAULT '' NOT NULL,
 	message_edit_reason text DEFAULT '' NOT NULL,
 	message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	message_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
 	message_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	bbcode_bitfield varchar(252) DEFAULT '' NOT NULL,
 	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 74c37acacd..adc86f7b26 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -848,7 +848,6 @@ CREATE TABLE phpbb_posts (
 	post_subject varchar2(1000) DEFAULT '' ,
 	post_text clob DEFAULT '' ,
 	post_checksum varchar2(32) DEFAULT '' ,
-	post_encoding varchar2(20) DEFAULT 'iso-8859-1' NOT NULL,
 	post_attachment number(1) DEFAULT '0' NOT NULL,
 	bbcode_bitfield varchar2(252) DEFAULT '' ,
 	bbcode_uid varchar2(5) DEFAULT '' ,
@@ -911,7 +910,6 @@ CREATE TABLE phpbb_privmsgs (
 	message_text clob DEFAULT '' ,
 	message_edit_reason varchar2(3000) DEFAULT '' ,
 	message_edit_user number(8) DEFAULT '0' NOT NULL,
-	message_encoding varchar2(20) DEFAULT 'iso-8859-1' NOT NULL,
 	message_attachment number(1) DEFAULT '0' NOT NULL,
 	bbcode_bitfield varchar2(252) DEFAULT '' ,
 	bbcode_uid varchar2(5) DEFAULT '' ,
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 147df5875b..a4e71e8acf 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -606,7 +606,6 @@ CREATE TABLE phpbb_posts (
 	post_subject varchar(1000) DEFAULT '' NOT NULL,
 	post_text TEXT DEFAULT '' NOT NULL,
 	post_checksum varchar(32) DEFAULT '' NOT NULL,
-	post_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
 	post_attachment INT2 DEFAULT '0' NOT NULL CHECK (post_attachment >= 0),
 	bbcode_bitfield varchar(252) DEFAULT '' NOT NULL,
 	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
@@ -647,7 +646,6 @@ CREATE TABLE phpbb_privmsgs (
 	message_text TEXT DEFAULT '' NOT NULL,
 	message_edit_reason varchar(3000) DEFAULT '' NOT NULL,
 	message_edit_user INT4 DEFAULT '0' NOT NULL CHECK (message_edit_user >= 0),
-	message_encoding varchar(20) DEFAULT 'iso-8859-1' NOT NULL,
 	message_attachment INT2 DEFAULT '0' NOT NULL CHECK (message_attachment >= 0),
 	bbcode_bitfield varchar(252) DEFAULT '' NOT NULL,
 	bbcode_uid varchar(5) DEFAULT '' NOT NULL,
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 6750113dce..adbffb4d0e 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -425,7 +425,6 @@ CREATE TABLE phpbb_posts (
 	post_subject text(65535) NOT NULL DEFAULT '',
 	post_text mediumtext(16777215) NOT NULL DEFAULT '',
 	post_checksum varchar(32) NOT NULL DEFAULT '',
-	post_encoding varchar(20) NOT NULL DEFAULT 'iso-8859-1',
 	post_attachment INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	bbcode_bitfield varchar(252) NOT NULL DEFAULT '',
 	bbcode_uid varchar(5) NOT NULL DEFAULT '',
@@ -461,7 +460,6 @@ CREATE TABLE phpbb_privmsgs (
 	message_text mediumtext(16777215) NOT NULL DEFAULT '',
 	message_edit_reason text(65535) NOT NULL DEFAULT '',
 	message_edit_user INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	message_encoding varchar(20) NOT NULL DEFAULT 'iso-8859-1',
 	message_attachment INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	bbcode_bitfield varchar(252) NOT NULL DEFAULT '',
 	bbcode_uid varchar(5) NOT NULL DEFAULT '',