From e36ccd9e10c6fcec5ae7f0f62fe26eb1069b7599 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 22 Nov 2012 16:02:18 +0000 Subject: [PATCH] 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) --- importexport/inc/class.importexport_import_ui.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php index 9344e3335f..4c8fed1414 100644 --- a/importexport/inc/class.importexport_import_ui.inc.php +++ b/importexport/inc/class.importexport_import_ui.inc.php @@ -325,7 +325,7 @@ $data = translation::convert($data,$options['charset']); $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.", count($options['field_mapping']),