[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5787-g79a23fc - Git

20 Jul 2010

The branch, master has been updated
       via  79a23fcd01ee2bd7ca2f5e5cb89bc993492597fa (commit)
      from  ee99ed3d39277b521c0f3b0aadfeecd5a548c647 (commit)
- Log -----------------------------------------------------------------
commit 79a23fcd01ee2bd7ca2f5e5cb89bc993492597fa
Author: Michal Čihař mcihar@novell.com
Date:   Tue Jul 20 12:20:06 2010 +0200
Forgotten occurence.
-----------------------------------------------------------------------
Summary of changes:
 libraries/charset_conversion.lib.php |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 5166a36..15f4a11 100644
--- a/libraries/charset_conversion.lib.php
+++ b/libraries/charset_conversion.lib.php
@@ -103,7 +103,6 @@ function PMA_convert_file($src_charset, $dest_charset, $file) {
     switch ($GLOBALS['PMA_recoding_engine']) {
         case PMA_CHARSET_RECODE:
         case PMA_CHARSET_ICONV:
-        case PMA_CHARSET_LIBICONV:
             $tmpfname = tempnam('', 'PMA_convert_file');
             $fin      = fopen($file, 'r');
             $fout     = fopen($tmpfname, 'w');
hooks/post-receive
-- 
phpMyAdmin


    