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

wrong function

Browse Source
This commit is contained in:
Marc Delisle
2002-07-10 10:04:53 +00:00
parent 55e714388f
commit b0c73d0c80
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2002-07-10 Marc Delisle <lem9@users.sourceforge.net>
* libraries/charset_conversion.lib.php3: wrong function called,
thanks to Michal Cihar
2002-07-09 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php3: fix from Lo<4C>c for bug 579017

4
libraries/charset_conversion.lib.php3
View File

@@ -83,7 +83,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
//Debug: echo 'PMA_convert_display_charset: ' . $what . '->' . iconv($convcharset, $charset, $what) . "\n<br />";
return iconv($convcharset, $charset, $what);
} else if (@function_exists('libiconv')) {
return iconv($convcharset, $charset, $what);
return libiconv($convcharset, $charset, $what);
} else if (@function_exists('recode_string')) {
return recode_string($convcharset . '..' . $charset, $what);
} else {
@@ -138,7 +138,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
//Debug: echo 'PMA_convert_charset: ' . $what . '->' . iconv($charset, $convcharset, $what) . "\n<br />";
return iconv($charset, $convcharset, $what);
} else if (@function_exists('libiconv')) {
return iconv($charset, $convcharset, $what);
return libiconv($charset, $convcharset, $what);
} else if (@function_exists('recode_string')) {
return recode_string($charset . '..' . $convcharset, $what);
} else {