holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backport r48680 from Nathan: fix Header lines to skip could not be set to 0

Browse Source
This commit is contained in:
Ralf Becker 2014-09-23 08:19:39 +00:00
parent 7a94452b7f
commit 9421749af2
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
View File

@ -203,16 +203,17 @@ class importexport_wizard_basic_import_csv
if(!$content['charset'] && $content['plugin_options']['charset']) { if(!$content['charset'] && $content['plugin_options']['charset']) {
$content['charset'] = $content['plugin_options']['charset']; $content['charset'] = $content['plugin_options']['charset'];
} }
if(!$content['has_header_line'] && $content['plugin_options']['has_header_line']) { if(!array_key_exists('num_header_lines', $content))
$content['num_header_lines'] = 1;
}
if(!$content['num_header_lines'] && $content['plugin_options']['num_header_lines']) {
$content['num_header_lines'] = $content['plugin_options']['num_header_lines'];
}
else
{ {
// Default to 1 line if(array_key_exists('num_header_lines', $content['plugin_options']))
$content['num_header_lines'] = 1; {
$content['num_header_lines'] = $content['plugin_options']['num_header_lines'];
}
else
{
// Default to 1 line
$content['num_header_lines'] = 1;
}
} }
if(!$content['update_cats'] && $content['plugin_options']['update_cats']) { if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
$content['update_cats'] = $content['plugin_options']['update_cats']; $content['update_cats'] = $content['plugin_options']['update_cats'];