From f152dbcf849d653892f352e4eed9c30d0b957576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@novell.com>
Date: Tue, 20 Jul 2010 12:10:41 +0200
Subject: [PATCH] The configuration directive is handled by generic config
 loading.

---
 libraries/charset_conversion.lib.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libraries/charset_conversion.lib.php b/libraries/charset_conversion.lib.php
index 9bdfd5bf9..ac7d2d9d2 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')) {