From 066664959e0819e0febcc5fb5fe28e8bedae444b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 29 Sep 2006 13:06:45 +0000 Subject: [PATCH] bug #1566904, typo --- ChangeLog | 4 ++++ libraries/database_interface.lib.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f02ff5a40..eefb4eb89 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-09-29 Marc Delisle + * libraries/database_interface.lib.php, bug #1566904, typo in require, + thanks to Björn Wiberg - bwiberg. + 2006-09-27 Marc Delisle * libraries/.htaccess: remove potential vulnerability (allow from none), thanks to Michael Heimpold diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 4f81d932d..4f3bd6f80 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -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 {