aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/includes/db/mssql.php5
-rwxr-xr-xphpBB/language/en/install.php2
2 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index 42ddb1a17a..c9946c2b5c 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -35,10 +35,7 @@ class dbal_mssql extends dbal
$this->server = $sqlserver . (($port) ? ':' . $port : '');
$this->dbname = $database;
- if (ini_get('mssql.charset'))
- {
- ini_set('mssql.charset', 'UTF-8');
- }
+ ini_set('mssql.charset', 'UTF-8');
$this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword) : @mssql_connect($this->server, $this->user, $sqlpassword);
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php
index f9371a503c..5868471fdd 100755
--- a/phpBB/language/en/install.php
+++ b/phpBB/language/en/install.php
@@ -215,7 +215,7 @@ $lang = array_merge($lang, array(
'MBSTRING_FUNC_OVERLOAD' => 'Function overloading',
'MBSTRING_FUNC_OVERLOAD_EXPLAIN' => 'mbstring.func_overload must be set to either 0 or 4',
'MBSTRING_ENCODING_TRANSLATION' => 'Transparent character encoding',
- 'MBSTRING_ENCODING_TRANSLATION_EXPLAIN' => 'mbstring.encoding_translation must be set to either 0',
+ 'MBSTRING_ENCODING_TRANSLATION_EXPLAIN' => 'mbstring.encoding_translation must be set 0',
'MBSTRING_HTTP_INPUT' => 'HTTP input character conversion',
'MBSTRING_HTTP_INPUT_EXPLAIN' => 'mbstring.http_input must be set to pass',
'MBSTRING_HTTP_OUTPUT' => 'HTTP output character conversion',