aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-07-30 15:00:32 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-07-30 15:00:32 +0200
commit9a3af2a052eacd384f2d6a4b3e490752f6156da4 (patch)
treec238393ce4308a583c6bca07c5bb499d1d6bb855 /phpBB/includes
parenta58cc394bc4f88becefac6d520f680a4063fcede (diff)
parenta0a5c852d5a7d19504bed1ed2d4f5a9cd403227d (diff)
downloadforums-9a3af2a052eacd384f2d6a4b3e490752f6156da4.tar
forums-9a3af2a052eacd384f2d6a4b3e490752f6156da4.tar.gz
forums-9a3af2a052eacd384f2d6a4b3e490752f6156da4.tar.bz2
forums-9a3af2a052eacd384f2d6a4b3e490752f6156da4.tar.xz
forums-9a3af2a052eacd384f2d6a4b3e490752f6156da4.zip
Merge pull request #2425 from Zoddo/ticket/12492
[ticket/12492] Add support of special chars * Zoddo/ticket/12492: [ticket/12492] Add support of special chars
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_install.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php
index 47f4eac627..21dd8bfebe 100644
--- a/phpBB/includes/functions_install.php
+++ b/phpBB/includes/functions_install.php
@@ -309,7 +309,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
{