[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5786-gee99ed3 - Git

20 Jul 2010

The branch, master has been updated
       via  ee99ed3d39277b521c0f3b0aadfeecd5a548c647 (commit)
      from  163aca52b4a8e7c1ad92212ca357ef92c5556828 (commit)
- Log -----------------------------------------------------------------
commit ee99ed3d39277b521c0f3b0aadfeecd5a548c647
Author: Michal Čihař mcihar@novell.com
Date:   Tue Jul 20 12:19:35 2010 +0200
libiconv is gone as of PHP 4.0.5, no need to support that
-----------------------------------------------------------------------
Summary of changes:
 libraries/charset_conversion.lib.php |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index adf0d49..5166a36 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -12,9 +12,8 @@ if (! defined('PHPMYADMIN')) {
define('PMA_CHARSET_NONE', 0);
 define('PMA_CHARSET_ICONV', 1);
-define('PMA_CHARSET_LIBICONV', 2);
-define('PMA_CHARSET_RECODE', 3);
-define('PMA_CHARSET_ICONV_AIX', 4);
+define('PMA_CHARSET_RECODE', 2);
+define('PMA_CHARSET_ICONV_AIX', 3);
// Finally detect which function we will use:
 if ($cfg['RecodingEngine'] == 'iconv') {
@@ -24,8 +23,6 @@ if ($cfg['RecodingEngine'] == 'iconv') {
         } else {
             $PMA_recoding_engine = PMA_CHARSET_ICONV;
         }
-    } elseif (@function_exists('libiconv')) {
-        $PMA_recoding_engine = PMA_CHARSET_LIBICONV;
     } else {
         $PMA_recoding_engine = PMA_CHARSET_NONE;
         PMA_warnMissingExtension('iconv');
@@ -44,8 +41,6 @@ if ($cfg['RecodingEngine'] == 'iconv') {
         } else {
             $PMA_recoding_engine = PMA_CHARSET_ICONV;
         }
-    } elseif (@function_exists('libiconv')) {
-        $PMA_recoding_engine = PMA_CHARSET_LIBICONV;
     } elseif (@function_exists('recode_string')) {
         $PMA_recoding_engine = PMA_CHARSET_RECODE;
     } else {
@@ -84,8 +79,6 @@ function PMA_convert_string($src_charset, $dest_charset, $what) {
             return iconv($src_charset, $dest_charset . $GLOBALS['cfg']['IconvExtraParams'], $what);
         case PMA_CHARSET_ICONV_AIX:
             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:
             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);
                     } elseif ($GLOBALS['PMA_recoding_engine'] == PMA_CHARSET_ICONV_AIX) {
                         $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);
                 } // end while
hooks/post-receive
-- 
phpMyAdmin


    