diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-30 15:01:16 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-30 15:01:16 +0200 |
| commit | 6d39a5b01505a41035c8c9a8ebcb1ee717b64e7f (patch) | |
| tree | 62317d227072b55003e226ea66e05bf590f9938a | |
| parent | e992eab4c3f39d22acacac70c95c62b942ca36ff (diff) | |
| parent | 9a3af2a052eacd384f2d6a4b3e490752f6156da4 (diff) | |
| download | forums-6d39a5b01505a41035c8c9a8ebcb1ee717b64e7f.tar forums-6d39a5b01505a41035c8c9a8ebcb1ee717b64e7f.tar.gz forums-6d39a5b01505a41035c8c9a8ebcb1ee717b64e7f.tar.bz2 forums-6d39a5b01505a41035c8c9a8ebcb1ee717b64e7f.tar.xz forums-6d39a5b01505a41035c8c9a8ebcb1ee717b64e7f.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12492] Add support of special chars
| -rw-r--r-- | phpBB/includes/functions_install.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index ab6ecb5519..28cc603bdb 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -266,7 +266,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, if (is_array($db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false, true))) { $db_error = $db->sql_error(); - $error[] = $lang['INST_ERR_DB_CONNECT'] . '<br />' . (($db_error['message']) ? $db_error['message'] : $lang['INST_ERR_DB_NO_ERROR']); + $error[] = $lang['INST_ERR_DB_CONNECT'] . '<br />' . (($db_error['message']) ? utf8_convert_message($db_error['message']) : $lang['INST_ERR_DB_NO_ERROR']); } else { |