diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-12-03 17:48:00 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-12-03 17:48:00 +0000 |
| commit | 3d38552c6918b5e3b94c885d1c6ff338380528d9 (patch) | |
| tree | 0992c9de2127a4cc2730aa52940823e5eb2e08b5 | |
| parent | 83443a362db2d4ccef25898d8192e2aa33cdbb68 (diff) | |
| download | forums-3d38552c6918b5e3b94c885d1c6ff338380528d9.tar forums-3d38552c6918b5e3b94c885d1c6ff338380528d9.tar.gz forums-3d38552c6918b5e3b94c885d1c6ff338380528d9.tar.bz2 forums-3d38552c6918b5e3b94c885d1c6ff338380528d9.tar.xz forums-3d38552c6918b5e3b94c885d1c6ff338380528d9.zip | |
blah
git-svn-id: file:///svn/phpbb/trunk@6707 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/db/mssql.php | 5 | ||||
| -rwxr-xr-x | phpBB/language/en/install.php | 2 |
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', |