Index: functions_convert.php =================================================================== --- functions_convert.php (revision 10462) +++ functions_convert.php (working copy) @@ -1231,7 +1231,10 @@ { $convert->p_master->error($user->lang['FILE_NOT_FOUND'] . ': ' . $filename, __LINE__, __FILE__); } - + if (!empty($convert->config_schema['array_name'])) + { + $convert->config_schema['array_name'] = array(); + } $convert_config = extract_variables_from_file($filename); if (!empty($convert->config_schema['array_name'])) { @@ -1264,6 +1267,7 @@ global $db, $config; $convert_config = get_config(); + foreach ($schema['settings'] as $config_name => $src) { if (preg_match('/(.*)\((.*)\)/', $src, $m)) @@ -1274,7 +1278,25 @@ } else { - $config_value = (isset($convert_config[$src])) ? $convert_config[$src] : ''; + if ($schema['table_format'] != 'file') + { + $config_value = (isset($convert_config[$src])) ? $convert_config[$src] : ''; + } + else if ($schema['table_format'] == 'file') + { + if (!empty($schema['array_name'])) + { + $arrayname = $schema['array_name']; + $config_value = (isset($convert_config[$arrayname][$src])) ? $convert_config[$arrayname][$src] : ''; + } + else + { + if (empty($schema['array_name'])) + { + $config_value = (isset($convert_config[$src])) ? $convert_config[$src] : ''; + } + } + } } if ($config_value !== '')