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

Do not die if RecodingEngine is auto and no engine is found.

Browse Source
This commit is contained in:
Michal Čihař
2010-07-20 12:09:22 +02:00
parent 42532065ab
commit 75593e3603
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/charset_conversion.lib.php
View File

@@ -64,11 +64,6 @@ if ($cfg['RecodingEngine'] == 'iconv') {
$PMA_recoding_engine = PMA_CHARSET_RECODE; $PMA_recoding_engine = PMA_CHARSET_RECODE;
} else { } else {
$PMA_recoding_engine = PMA_CHARSET_NONE; $PMA_recoding_engine = PMA_CHARSET_NONE;
require_once './libraries/header.inc.php';
echo __('Couldn\'t use the iconv, libiconv, or recode_string functions, although the necessary extensions appear to be loaded. Check your PHP configuration.');
require_once './libraries/footer.inc.php';
exit;
} }
} else { } else {
$PMA_recoding_engine = PMA_CHARSET_NONE; $PMA_recoding_engine = PMA_CHARSET_NONE;