extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Number of columns in file must match number of columns in sample file given to definition instead of number of columns imported (to get non-imported columns working again)

Browse Source
This commit is contained in:
Nathan Gray 2012-11-22 16:02:18 +00:00
parent 15df850d28
commit e36ccd9e10
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
importexport/inc/class.importexport_import_ui.inc.php
View File

@ -325,7 +325,7 @@
$data = translation::convert($data,$options['charset']); $data = translation::convert($data,$options['charset']);
$ok = true; $ok = true;
if(count($data) != count($options['field_mapping']) && max(array_keys($data)) != max(array_keys($options['field_mapping']))) if(count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
{ {
$message[] = lang("Column mismatch. Expected %1 columns, your file has %2.", $message[] = lang("Column mismatch. Expected %1 columns, your file has %2.",
count($options['field_mapping']), count($options['field_mapping']),