extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move preserve to allow for clearing conditions

Browse Source
This commit is contained in:
Nathan Gray 2011-10-31 16:30:57 +00:00
parent 4449f65797
commit 41493e7c51
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

@ -375,6 +375,7 @@ class importexport_wizard_basic_import_csv
if(!$content['conditions'] && $content['plugin_options']['conditions']) { if(!$content['conditions'] && $content['plugin_options']['conditions']) {
$content['conditions'] = $content['plugin_options']['conditions']; $content['conditions'] = $content['plugin_options']['conditions'];
} }
$preserv = $content;
foreach($content['field_mapping'] as $field) { foreach($content['field_mapping'] as $field) {
$sel_options['string'][$field] = $this->mapping_fields[$field]; $sel_options['string'][$field] = $this->mapping_fields[$field];
@ -397,7 +398,6 @@ class importexport_wizard_basic_import_csv
// Leave room for heading // Leave room for heading
array_unshift($content['conditions'], false); array_unshift($content['conditions'], false);
$preserv = $content;
unset ($preserv['button']); unset ($preserv['button']);
return $this->step_templates[$content['step']]; return $this->step_templates[$content['step']];
} }