Standard warnings for missing extensions.
This commit is contained in:
@@ -28,24 +28,14 @@ if ($cfg['RecodingEngine'] == 'iconv') {
|
|||||||
$PMA_recoding_engine = PMA_CHARSET_LIBICONV;
|
$PMA_recoding_engine = PMA_CHARSET_LIBICONV;
|
||||||
} else {
|
} else {
|
||||||
$PMA_recoding_engine = PMA_CHARSET_NONE;
|
$PMA_recoding_engine = PMA_CHARSET_NONE;
|
||||||
|
PMA_warnMissingExtension('iconv');
|
||||||
if (!isset($GLOBALS['is_header_sent'])) {
|
|
||||||
include './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();
|
|
||||||
}
|
}
|
||||||
} elseif ($cfg['RecodingEngine'] == 'recode') {
|
} elseif ($cfg['RecodingEngine'] == 'recode') {
|
||||||
if (@function_exists('recode_string')) {
|
if (@function_exists('recode_string')) {
|
||||||
$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;
|
||||||
|
PMA_warnMissingExtension('recode');
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
} elseif ($cfg['RecodingEngine'] == 'auto') {
|
} elseif ($cfg['RecodingEngine'] == 'auto') {
|
||||||
if (@function_exists('iconv')) {
|
if (@function_exists('iconv')) {
|
||||||
|
Reference in New Issue
Block a user