Merged patch #729514 - support for iconv parameters.

2003-05-11 17:29:53 +00:00
parent 864b9beb07
commit 38db258110
5 changed files with 32 additions and 4 deletions
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -482,6 +482,10 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) {
        $cfg['AllowAnywhereRecoding'] = FALSE;
    }

+    if (!isset($cfg['IconvExtraParams'])) {
+        $cfg['IconvExtraParams'] = '//IGNORE';
+    }
+
    if (!isset($cfg['Lang']) &&isset($cfgLang)) {
        $cfg['Lang'] = $cfgLang;
        unset($cfgLang);