The branch, master has been updated via be6e0eb8f35ca6dc8aae1762e1a0279c9afdc681 (commit) via f152dbcf849d653892f352e4eed9c30d0b957576 (commit) from 75593e3603b87ced82cfdf34a5cf03ea129db7e0 (commit)
- Log ----------------------------------------------------------------- commit be6e0eb8f35ca6dc8aae1762e1a0279c9afdc681 Author: Michal Čihař mcihar@novell.com Date: Tue Jul 20 12:13:29 2010 +0200
Standard warnings for missing extensions.
commit f152dbcf849d653892f352e4eed9c30d0b957576 Author: Michal Čihař mcihar@novell.com Date: Tue Jul 20 12:10:41 2010 +0200
The configuration directive is handled by generic config loading.
-----------------------------------------------------------------------
Summary of changes: libraries/charset_conversion.lib.php | 18 ++---------------- 1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php index 9bdfd5b..adf0d49 100644 --- a/libraries/charset_conversion.lib.php +++ b/libraries/charset_conversion.lib.php @@ -16,10 +16,6 @@ define('PMA_CHARSET_LIBICONV', 2); define('PMA_CHARSET_RECODE', 3); define('PMA_CHARSET_ICONV_AIX', 4);
-if (!isset($cfg['IconvExtraParams'])) { - $cfg['IconvExtraParams'] = ''; -} - // Finally detect which function we will use: if ($cfg['RecodingEngine'] == 'iconv') { if (@function_exists('iconv')) { @@ -32,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')) {
hooks/post-receive