This commit is contained in:
Marc Delisle
2006-09-29 13:06:45 +00:00
parent b09e199a45
commit 066664959e
2 changed files with 5 additions and 1 deletions

View File

@@ -147,7 +147,7 @@ function PMA_DBI_convert_message( $message ) {
if ( ! empty( $server_language ) && isset( $encodings[$server_language] ) ) {
if ( function_exists( 'iconv' ) ) {
if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) {
require_once('./liraries/iconv_wrapper.lib.php');
require_once('./libraries/iconv_wrapper.lib.php');
$message = PMA_aix_iconv_wrapper( $encodings[$server_language],
$GLOBALS['charset'] . $GLOBALS['cfg']['IconvExtraParams'], $message);
} else {