diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index 20ee281c7c..ed4b4fa0b9 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -328,7 +328,7 @@ CREATE TABLE phpbb_posts ( post_subject VARCHAR(60), post_text BLOB SUB_TYPE TEXT, post_checksum VARCHAR(32) NOT NULL, - post_encoding VARCHAR(11) DEFAULT 'iso-8859-15' NOT NULL, + post_encoding VARCHAR(11) DEFAULT 'iso-8859-1' NOT NULL, post_attachment INTEGER DEFAULT 0 NOT NULL, bbcode_bitfield INTEGER DEFAULT 0 NOT NULL, bbcode_uid VARCHAR(5) NOT NULL, @@ -358,7 +358,7 @@ CREATE TABLE phpbb_privmsgs ( message_edit_reason VARCHAR(100), message_edit_user INTEGER DEFAULT 0 NOT NULL, message_checksum VARCHAR(32) NOT NULL, - message_encoding VARCHAR(11) DEFAULT 'iso-8859-15' NOT NULL, + message_encoding VARCHAR(11) DEFAULT 'iso-8859-1' NOT NULL, message_attachment INTEGER DEFAULT 0 NOT NULL, bbcode_bitfield INTEGER DEFAULT 0 NOT NULL, bbcode_uid VARCHAR(5) NOT NULL, diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql index 0881335fe8..af3fa0606e 100644 --- a/phpBB/install/schemas/mssql_schema.sql +++ b/phpBB/install/schemas/mssql_schema.sql @@ -1322,7 +1322,7 @@ ALTER TABLE [phpbb_posts] WITH NOCHECK ADD CONSTRAINT [DF_posts__enable_smilies] DEFAULT (1) FOR [enable_smilies], CONSTRAINT [DF_posts__enable_magic_url] DEFAULT (1) FOR [enable_magic_url], CONSTRAINT [DF_posts__enable_sig] DEFAULT (1) FOR [enable_sig], - CONSTRAINT [DF_posts__post_encoding] DEFAULT ('iso-8859-15') FOR [post_encoding], + CONSTRAINT [DF_posts__post_encoding] DEFAULT ('iso-8859-1') FOR [post_encoding], CONSTRAINT [DF_posts__post_attachment] DEFAULT (0) FOR [post_attachment], CONSTRAINT [DF_posts__bbcode_bitfield] DEFAULT (0) FOR [bbcode_bitfield], CONSTRAINT [DF_posts__post_edit_time] DEFAULT (0) FOR [post_edit_time], @@ -1343,7 +1343,7 @@ ALTER TABLE [phpbb_privmsgs] WITH NOCHECK ADD CONSTRAINT [DF_privms_enable_magic_url] DEFAULT (1) FOR [enable_magic_url], CONSTRAINT [DF_privms_enable_sig] DEFAULT (1) FOR [enable_sig], CONSTRAINT [DF_privms_message_edit_user] DEFAULT (0) FOR [message_edit_user], - CONSTRAINT [DF_privms_message_encoding] DEFAULT ('iso-8859-15') FOR [message_encoding], + CONSTRAINT [DF_privms_message_encoding] DEFAULT ('iso-8859-1') FOR [message_encoding], CONSTRAINT [DF_privms_message_attachment] DEFAULT (0) FOR [message_attachment], CONSTRAINT [DF_privms_bbcode_bitfield] DEFAULT (0) FOR [bbcode_bitfield], CONSTRAINT [DF_privms_message_edit_time] DEFAULT (0) FOR [message_edit_time], diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql index d0a292280d..43afcdf095 100644 --- a/phpBB/install/schemas/mysql_schema.sql +++ b/phpBB/install/schemas/mysql_schema.sql @@ -385,7 +385,7 @@ CREATE TABLE phpbb_posts ( post_subject varchar(60), post_text mediumtext, post_checksum varchar(32) NOT NULL, - post_encoding varchar(11) DEFAULT 'iso-8859-15' NOT NULL, + post_encoding varchar(11) DEFAULT 'iso-8859-1' NOT NULL, post_attachment tinyint(1) DEFAULT '0' NOT NULL, bbcode_bitfield int(11) UNSIGNED DEFAULT '0' NOT NULL, bbcode_uid varchar(5) DEFAULT '' NOT NULL, @@ -422,7 +422,7 @@ CREATE TABLE phpbb_privmsgs ( message_edit_reason varchar(100), message_edit_user mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, message_checksum varchar(32) DEFAULT '' NOT NULL, - message_encoding varchar(11) DEFAULT 'iso-8859-15' NOT NULL, + message_encoding varchar(11) DEFAULT 'iso-8859-1' NOT NULL, message_attachment tinyint(1) DEFAULT '0' NOT NULL, bbcode_bitfield int(11) UNSIGNED DEFAULT '0' 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 3bb1ef88d2..181af27c47 100644 --- a/phpBB/install/schemas/oracle_schema.sql +++ b/phpBB/install/schemas/oracle_schema.sql @@ -784,7 +784,7 @@ CREATE TABLE phpbb_posts ( post_subject varchar2(60), post_text clob, post_checksum varchar2(32), - post_encoding varchar2(11) DEFAULT 'iso-8859-15', + post_encoding varchar2(11) DEFAULT 'iso-8859-1', post_attachment number(1) DEFAULT '0' NOT NULL, bbcode_bitfield number(11) DEFAULT '0' NOT NULL, bbcode_uid varchar2(5) DEFAULT '', @@ -846,7 +846,7 @@ CREATE TABLE phpbb_privmsgs ( message_edit_reason varchar2(100), message_edit_user number(8) DEFAULT '0' NOT NULL, message_checksum varchar2(32) DEFAULT '', - message_encoding varchar2(11) DEFAULT 'iso-8859-15', + message_encoding varchar2(11) DEFAULT 'iso-8859-1', message_attachment number(1) DEFAULT '0' NOT NULL, bbcode_bitfield number(11) DEFAULT '0' NOT NULL, bbcode_uid varchar2(5) DEFAULT '', diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql index 9ce7f4864c..b018079a51 100644 --- a/phpBB/install/schemas/postgres_schema.sql +++ b/phpBB/install/schemas/postgres_schema.sql @@ -517,7 +517,7 @@ CREATE TABLE phpbb_posts ( post_subject varchar(60), post_text text, post_checksum varchar(32) NOT NULL, - post_encoding varchar(11) DEFAULT 'iso-8859-15' NOT NULL, + post_encoding varchar(11) DEFAULT 'iso-8859-1' NOT NULL, post_attachment INT2 DEFAULT '0' NOT NULL, bbcode_bitfield INT4 DEFAULT '0' NOT NULL, bbcode_uid varchar(5) DEFAULT '' NOT NULL, @@ -568,7 +568,7 @@ CREATE TABLE phpbb_privmsgs ( message_edit_reason varchar(100), message_edit_user INT4 DEFAULT '0' NOT NULL, message_checksum varchar(32) DEFAULT '' NOT NULL, - message_encoding varchar(11) DEFAULT 'iso-8859-15' NOT NULL, + message_encoding varchar(11) DEFAULT 'iso-8859-1' NOT NULL, message_attachment INT2 DEFAULT '0' NOT NULL, bbcode_bitfield INT4 DEFAULT '0' 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 090d8427dd..bd2bc7a3e4 100644 --- a/phpBB/install/schemas/sqlite_schema.sql +++ b/phpBB/install/schemas/sqlite_schema.sql @@ -388,7 +388,7 @@ CREATE TABLE phpbb_posts ( post_subject varchar(60), post_text mediumtext(16777215), post_checksum varchar(32) NOT NULL, - post_encoding varchar(11) NOT NULL DEFAULT 'iso-8859-15', + post_encoding varchar(11) NOT NULL DEFAULT 'iso-8859-1', post_attachment tinyint(1) NOT NULL DEFAULT '0', bbcode_bitfield int(11) NOT NULL DEFAULT '0', bbcode_uid varchar(5) NOT NULL DEFAULT '', @@ -425,7 +425,7 @@ CREATE TABLE phpbb_privmsgs ( message_edit_reason varchar(100), message_edit_user mediumint(8) NOT NULL DEFAULT '0', message_checksum varchar(32) NOT NULL DEFAULT '', - message_encoding varchar(11) NOT NULL DEFAULT 'iso-8859-15', + message_encoding varchar(11) NOT NULL DEFAULT 'iso-8859-1', message_attachment tinyint(1) NOT NULL DEFAULT '0', bbcode_bitfield int(11) NOT NULL DEFAULT '0', bbcode_uid varchar(5) NOT NULL DEFAULT '', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 0a5783aad0..dddb77c080 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -29,7 +29,7 @@ if (empty($lang) || !is_array($lang)) // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang += array( - 'ENCODING' => 'iso-8859-15', + 'ENCODING' => 'iso-8859-1', 'DIRECTION' => 'ltr', 'LEFT' => 'left', 'RIGHT' => 'right',