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

libiconv is gone as of PHP 4.0.5, no need to support that

Browse Source
This commit is contained in:
Michal Čihař
2010-07-20 12:19:35 +02:00
parent 163aca52b4
commit ee99ed3d39
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/charset_conversion.lib.php
View File

@@ -12,9 +12,8 @@ if (! defined('PHPMYADMIN')) {
define('PMA_CHARSET_NONE', 0); define('PMA_CHARSET_NONE', 0);
define('PMA_CHARSET_ICONV', 1); define('PMA_CHARSET_ICONV', 1);
define('PMA_CHARSET_LIBICONV', 2); define('PMA_CHARSET_RECODE', 2);
define('PMA_CHARSET_RECODE', 3); define('PMA_CHARSET_ICONV_AIX', 3);
define('PMA_CHARSET_ICONV_AIX', 4);
// Finally detect which function we will use: // Finally detect which function we will use:
if ($cfg['RecodingEngine'] == 'iconv') { if ($cfg['RecodingEngine'] == 'iconv') {
@@ -24,8 +23,6 @@ if ($cfg['RecodingEngine'] == 'iconv') {
} else { } else {
$PMA_recoding_engine = PMA_CHARSET_ICONV; $PMA_recoding_engine = PMA_CHARSET_ICONV;
} }
} elseif (@function_exists('libiconv')) {
$PMA_recoding_engine = PMA_CHARSET_LIBICONV;
} else { } else {
$PMA_recoding_engine = PMA_CHARSET_NONE; $PMA_recoding_engine = PMA_CHARSET_NONE;
PMA_warnMissingExtension('iconv'); PMA_warnMissingExtension('iconv');
@@ -44,8 +41,6 @@ if ($cfg['RecodingEngine'] == 'iconv') {
} else { } else {
$PMA_recoding_engine = PMA_CHARSET_ICONV; $PMA_recoding_engine = PMA_CHARSET_ICONV;
} }
} elseif (@function_exists('libiconv')) {
$PMA_recoding_engine = PMA_CHARSET_LIBICONV;
} elseif (@function_exists('recode_string')) { } elseif (@function_exists('recode_string')) {
$PMA_recoding_engine = PMA_CHARSET_RECODE; $PMA_recoding_engine = PMA_CHARSET_RECODE;
} else { } else {
@@ -84,8 +79,6 @@ function PMA_convert_string($src_charset, $dest_charset, $what) {
return iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what); return iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what);
case PMA_CHARSET_ICONV_AIX: case PMA_CHARSET_ICONV_AIX:
return PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what); return PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what);
case PMA_CHARSET_LIBICONV:
return libiconv($src_charset, $dest_charset, $what);
default: default:
return $what; return $what;
} }
@@ -123,8 +116,6 @@ function PMA_convert_file($src_charset, $dest_charset, $file) {
$dist = iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line); $dist = iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line);
} elseif ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV_AIX) { } elseif ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV_AIX) {
$dist = PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line); $dist = PMA_aix_iconv_wrapper($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line);
} else {
$dist = libiconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $line);
} }
fputs($fout, $dist); fputs($fout, $dist);
} // end while } // end while