diff --git a/importexport/inc/class.importexport_export_ui.inc.php b/importexport/inc/class.importexport_export_ui.inc.php
index 02058de323..021626d580 100644
--- a/importexport/inc/class.importexport_export_ui.inc.php
+++ b/importexport/inc/class.importexport_export_ui.inc.php
@@ -224,6 +224,8 @@ class importexport_export_ui {
$content['filter'][$field] = importexport_helper_functions::date_rel2abs($content['filter'][$field]);
}
}
+ // Filter is used twice in template, but can't have the same ID
+ $content['filter_html'] = $content['filter_tpl'] = $content['filter'];
}
}
@@ -286,6 +288,7 @@ class importexport_export_ui {
// Set filter
// Note that because not all dates are DB dates, the plugin has to handle them
$filter = array();
+ $_content['filter'] = $_content['filter_html'] ? $_content['filter_html'] : $_content['filter_tpl'];
if(is_array($_content['filter']))
{
foreach($_content['filter'] as $key => $value)
diff --git a/importexport/inc/class.importexport_widget_filter.inc.php b/importexport/inc/class.importexport_widget_filter.inc.php
index 9792410e58..9014c5fd51 100644
--- a/importexport/inc/class.importexport_widget_filter.inc.php
+++ b/importexport/inc/class.importexport_widget_filter.inc.php
@@ -54,7 +54,7 @@ class importexport_widget_filter extends etemplate_widget_transformer
error_log("$this has no fields");
self::$transformation = array(
'type' => 'label',
- 'label' => 'No fields'
+ 'value' => 'No fields'
);
return parent::beforeSendToClient($cname);
}
diff --git a/importexport/templates/default/export_dialog.xet b/importexport/templates/default/export_dialog.xet
index b45fde4f9a..9a02a5cbbb 100644
--- a/importexport/templates/default/export_dialog.xet
+++ b/importexport/templates/default/export_dialog.xet
@@ -65,7 +65,7 @@
-
+
@@ -75,7 +75,7 @@
-
+