diff --git a/ChangeLog b/ChangeLog index 6c0a79ef69..2ffddc0c67 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ $Source$ 2006-09-29 Marc Delisle * libraries/grab_globals.lib.php: fix attack via _FILES, thanks to Stefan Esser + * libraries/database_interface.lib.php, bug #1566904, typo in require, + thanks to Björn Wiberg - bwiberg. 2006-09-27 Marc Delisle * libraries/common.lib.php, /session.inc.php, /url_generating.lib.php: diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 2f42880ebb..0792260da4 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -145,7 +145,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 {