diff --git a/ChangeLog b/ChangeLog index 81438c11b..c9fe0b093 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-06-01 Michal Cihar + * config.inc.php3, libraries/config_import.lib.php3: Default iconv + parameters to empty string, as older iconv version don't support it + (bug #747164). + 2003-06-01 Alexander M. Turek * lang/catalan-*.inc.php3: Updates, thanks to Xavier Navarro (xavin). diff --git a/config.inc.php3 b/config.inc.php3 index f49cc5260..5e1a42baf 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -322,7 +322,7 @@ $cfg['RecodingEngine'] = 'auto'; // Specify some parameters for iconv used in charset conversion. See iconv // documentation for details: // http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html -$cfg['IconvExtraParams'] = '//IGNORE'; +$cfg['IconvExtraParams'] = ''; // Available charsets for MySQL conversion. currently contains all which could // be found in lang/* files and few more. diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 index 1eadea283..ee67051a4 100644 --- a/libraries/config_import.lib.php3 +++ b/libraries/config_import.lib.php3 @@ -491,7 +491,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { } if (!isset($cfg['IconvExtraParams'])) { - $cfg['IconvExtraParams'] = '//IGNORE'; + $cfg['IconvExtraParams'] = ''; } if (!isset($cfg['Lang']) &&isset($cfgLang)) {