nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1566904, typo

Browse Source
This commit is contained in:
Marc Delisle
2006-09-29 13:04:17 +00:00
parent 9a581ab5d8
commit a86effd742
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -8,6 +8,8 @@ $Source$
2006-09-29 Marc Delisle <lem9@users.sourceforge.net> 2006-09-29 Marc Delisle <lem9@users.sourceforge.net>
* libraries/grab_globals.lib.php: fix attack via _FILES, * libraries/grab_globals.lib.php: fix attack via _FILES,
thanks to Stefan Esser 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 <lem9@users.sourceforge.net> 2006-09-27 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php, /session.inc.php, /url_generating.lib.php: * libraries/common.lib.php, /session.inc.php, /url_generating.lib.php:

2
libraries/database_interface.lib.php
View File

@@ -145,7 +145,7 @@ function PMA_DBI_convert_message( $message ) {
if ( ! empty( $server_language ) && isset( $encodings[$server_language] ) ) { if ( ! empty( $server_language ) && isset( $encodings[$server_language] ) ) {
if ( function_exists( 'iconv' ) ) { if ( function_exists( 'iconv' ) ) {
if ((@stristr(PHP_OS, 'AIX')) && (@strcasecmp(ICONV_IMPL, 'unknown') == 0) && (@strcasecmp(ICONV_VERSION, 'unknown') == 0)) { 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], $message = PMA_aix_iconv_wrapper( $encodings[$server_language],
$GLOBALS['charset'] . $GLOBALS['cfg']['IconvExtraParams'], $message); $GLOBALS['charset'] . $GLOBALS['cfg']['IconvExtraParams'], $message);
} else { } else {