extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try field mapping for both parts of column count check

Browse Source
This commit is contained in:
Nathan Gray 2012-10-10 18:39:03 +00:00
parent 20908f688e
commit d06f3a82ee
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

@ -294,7 +294,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['csv_fields']))) if(count($data) != count($options['field_mapping']) && max(array_keys($data)) != max(array_keys($options['field_mapping'])))
{ {
$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']),