From 20d6378bd2909fe8338b198ff39a2883ae6b821f Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 28 Feb 2011 18:10:18 +0000 Subject: [PATCH] Change importexport exporting to be able to pass a definition --- etemplate/inc/class.nextmatch_widget.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php index 4bb596d313..1862ef04f8 100644 --- a/etemplate/inc/class.nextmatch_widget.inc.php +++ b/etemplate/inc/class.nextmatch_widget.inc.php @@ -478,13 +478,13 @@ class nextmatch_widget if(!$value['no_csv_export'] && ($value['csv_fields'] && !is_array($value['csv_fields']) || !array_key_exists('csv_fields', $value))) { $name = is_object($extension_data['template']) ? $extension_data['template']->name : $extension_data['template']; list($app) = explode('.',$name); - $key = $extension_data['csv_fields'] === true ? 'nextmatch-export-definition' : $extension_data['csv_fields']; - if($GLOBALS['egw_info']['user']['apps']['importexport'] && $GLOBALS['egw_info']['user']['preferences'][$app][$key]) { + $definition = $value['csv_fields'] === true ? $GLOBALS['egw_info']['user']['preferences'][$app]['nextmatch-export-definition'] : $value['csv_fields']; + if($GLOBALS['egw_info']['user']['apps']['importexport'] && $definition) { $nextmatch->set_cell_attribute('export', 'onclick', "egw_openWindowCentered2('". egw::link('/index.php', array( 'menuaction' => 'importexport.importexport_export_ui.export_dialog', 'appname' => $app, - 'definition' => $GLOBALS['egw_info']['user']['preferences'][$app][$key] + 'definition' => $definition )) . "', '_blank', 850, 440, 'yes'); return false;" );