extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 17:52:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure field_mapping is an array before trying to index into it

Browse Source
This commit is contained in:
Nathan Gray 2010-10-13 17:26:34 +00:00
parent 831c5e0f84
commit 845d8f533c
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_wizard_basic_import_csv.inc.php
View File

@ -134,7 +134,7 @@ class importexport_wizard_basic_import_csv
$english = array(); $english = array();
foreach($content['csv_fields'] as $index => $field) { foreach($content['csv_fields'] as $index => $field) {
if($content['field_mapping'][$index]) continue; 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 # Copy already set, but allow new file to update
$content['field_mapping'][$index] = $content['plugin_options']['field_mapping'][$index]; $content['field_mapping'][$index] = $content['plugin_options']['field_mapping'][$index];
} }