diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-30 15:01:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-30 15:01:27 +0200 |
| commit | c068da7353b0d3dc0827a89ac01b274f9e6e7ce6 (patch) | |
| tree | b3f02341e9e3631f8e2fcf0a02179dd831ea7d8f /phpBB/includes/functions_install.php | |
| parent | 7d4b019266c20da2e9677829b0dd0a7f7d740833 (diff) | |
| parent | 6d39a5b01505a41035c8c9a8ebcb1ee717b64e7f (diff) | |
| download | forums-c068da7353b0d3dc0827a89ac01b274f9e6e7ce6.tar forums-c068da7353b0d3dc0827a89ac01b274f9e6e7ce6.tar.gz forums-c068da7353b0d3dc0827a89ac01b274f9e6e7ce6.tar.bz2 forums-c068da7353b0d3dc0827a89ac01b274f9e6e7ce6.tar.xz forums-c068da7353b0d3dc0827a89ac01b274f9e6e7ce6.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12492] Add support of special chars
Diffstat (limited to 'phpBB/includes/functions_install.php')
| -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 { |