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

Don't let php display an error message if dl() fails.

Browse Source
This commit is contained in:
Alexander M. Turek
2002-08-23 06:13:07 +00:00
parent 619b72b1ef
commit 470fe2acac
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-08-23 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/charset_conversion.lib.php3: Don't let php display an error
message if dl() fails.
2002-08-22 Robin Johnson <robbat2@users.sourceforge.net> 2002-08-22 Robin Johnson <robbat2@users.sourceforge.net>
* config.inc.php3, left.php3: * config.inc.php3, left.php3:
- $cfg['LeftDisplayLogo'] to turn off PMA logo display - $cfg['LeftDisplayLogo'] to turn off PMA logo display

8
libraries/charset_conversion.lib.php3
View File

@@ -38,7 +38,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
if ($cfg['RecodingEngine'] == 'recode') { if ($cfg['RecodingEngine'] == 'recode') {
if (!@extension_loaded('recode')) { if (!@extension_loaded('recode')) {
dl('recode' . $suffix); @dl('recode' . $suffix);
if (!@extension_loaded('recode')) { if (!@extension_loaded('recode')) {
echo $strCantLoadRecodeIconv; echo $strCantLoadRecodeIconv;
exit(); exit();
@@ -47,7 +47,7 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
$PMA_recoding_engine = 'recode'; $PMA_recoding_engine = 'recode';
} else if ($cfg['RecodingEngine'] == 'iconv') { } else if ($cfg['RecodingEngine'] == 'iconv') {
if (!@extension_loaded('iconv')) { if (!@extension_loaded('iconv')) {
dl('iconv' . $suffix); @dl('iconv' . $suffix);
if (!@extension_loaded('iconv')) { if (!@extension_loaded('iconv')) {
echo $strCantLoadRecodeIconv; echo $strCantLoadRecodeIconv;
exit(); exit();
@@ -60,9 +60,9 @@ if (!defined('PMA_CHARSET_CONVERSION_LIB_INCLUDED')){
} else if (@extension_loaded('recode')) { } else if (@extension_loaded('recode')) {
$PMA_recoding_engine = 'recode'; $PMA_recoding_engine = 'recode';
} else { } else {
dl('iconv' . $suffix); @dl('iconv' . $suffix);
if (!@extension_loaded('iconv')) { if (!@extension_loaded('iconv')) {
dl('recode' . $suffix); @dl('recode' . $suffix);
if (!@extension_loaded('recode')) { if (!@extension_loaded('recode')) {
echo $strCantLoadRecodeIconv; echo $strCantLoadRecodeIconv;
exit(); exit();