From a0a3cfb4fcb7eef0ac9b3d2fc433297419ab1809 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Tue, 9 Oct 2012 15:55:57 +0000 Subject: [PATCH] Still check original file columns --- 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 a54793d65f..152b805ca3 100644 --- a/importexport/inc/class.importexport_import_ui.inc.php +++ b/importexport/inc/class.importexport_import_ui.inc.php @@ -294,7 +294,7 @@ $data = translation::convert($data,$options['charset']); $ok = true; - if(count($data) != count($options['field_mapping'])) + if(count($data) != count($options['field_mapping']) && 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']),