From be6e0eb8f35ca6dc8aae1762e1a0279c9afdc681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 20 Jul 2010 12:13:29 +0200 Subject: [PATCH] Standard warnings for missing extensions. --- libraries/charset_conversion.lib.php | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index ac7d2d9d2..adf0d493d 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -28,24 +28,14 @@ if ($cfg['RecodingEngine'] == 'iconv') { $PMA_recoding_engine = PMA_CHARSET_LIBICONV; } else { $PMA_recoding_engine = PMA_CHARSET_NONE; - - 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(); + PMA_warnMissingExtension('iconv'); } } elseif ($cfg['RecodingEngine'] == 'recode') { if (@function_exists('recode_string')) { $PMA_recoding_engine = PMA_CHARSET_RECODE; } else { $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; + PMA_warnMissingExtension('recode'); } } elseif ($cfg['RecodingEngine'] == 'auto') { if (@function_exists('iconv')) {