From 845d8f533cad345d9b5136207c013009dbf27c25 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Wed, 13 Oct 2010 17:26:34 +0000
Subject: [PATCH] Make sure field_mapping is an array before trying to index
 into it

---
 .../inc/class.importexport_wizard_basic_import_csv.inc.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
index 0a9dcd989d..1d6508ccbe 100644
--- a/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
+++ b/importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
@@ -134,7 +134,7 @@ class importexport_wizard_basic_import_csv
 						$english = array();
 						foreach($content['csv_fields'] as $index => $field) {
 							if($content['field_mapping'][$index]) continue;
-							if($content['plugin_options']['field_mapping'][$index]) {
+							if(is_array($content['plugin_options']['field_mapping']) && $content['plugin_options']['field_mapping'][$index]) {
 								# Copy already set, but allow new file to update
 								$content['field_mapping'][$index] = $content['plugin_options']['field_mapping'][$index];
 							}