diff --git a/ChangeLog b/ChangeLog index 33aad645d..9e165041a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-08-23 Alexander M. Turek + * libraries/charset_conversion.lib.php3: Don't let php display an error + message if dl() fails. + 2002-08-22 Robin Johnson * config.inc.php3, left.php3: - $cfg['LeftDisplayLogo'] to turn off PMA logo display diff --git a/libraries/charset_conversion.lib.php3 b/libraries/charset_conversion.lib.php3 index a68bf2f3b..10e14fd74 100644 --- a/libraries/charset_conversion.lib.php3 +++ b/libraries/charset_conversion.lib.php3 @@ -38,7 +38,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){ if ($cfg['RecodingEngine'] == 'recode') { if (!@extension_loaded('recode')) { - dl('recode' . $suffix); + @dl('recode' . $suffix); if (!@extension_loaded('recode')) { echo $strCantLoadRecodeIconv; exit(); @@ -47,7 +47,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){ $PMA_recoding_engine = 'recode'; } else if ($cfg['RecodingEngine'] == 'iconv') { if (!@extension_loaded('iconv')) { - dl('iconv' . $suffix); + @dl('iconv' . $suffix); if (!@extension_loaded('iconv')) { echo $strCantLoadRecodeIconv; exit(); @@ -60,9 +60,9 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){ } else if (@extension_loaded('recode')) { $PMA_recoding_engine = 'recode'; } else { - dl('iconv' . $suffix); + @dl('iconv' . $suffix); if (!@extension_loaded('iconv')) { - dl('recode' . $suffix); + @dl('recode' . $suffix); if (!@extension_loaded('recode')) { echo $strCantLoadRecodeIconv; exit();