From 7ad4ebfdea9be42d166b279e016ff0d6cd28b4b6 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Thu, 6 Mar 2014 22:30:44 +0000 Subject: [PATCH] Remove nextmatch export button --- addressbook/inc/class.addressbook_ui.inc.php | 4 ---- infolog/inc/class.infolog_ui.inc.php | 5 ----- 2 files changed, 9 deletions(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index aa14930eb5..a264838775 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -232,10 +232,6 @@ class addressbook_ui extends addressbook_bo 'favorites' => true, 'placeholder_actions' => array('add') ); - $csv_export = new addressbook_csv($this); - $content['nm']['csv_fields'] = $GLOBALS['egw_info']['user']['preferences']['addressbook']['nextmatch-export-definition'] ? - $GLOBALS['egw_info']['user']['preferences']['addressbook']['nextmatch-export-definition'] : - $csv_export->csv_fields(null,true); if ($do_email) { diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index 8412f06f92..dd06b3195e 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -287,10 +287,6 @@ class infolog_ui //echo "

infolog_ui.get_rows(start=$query[start],search='$query[search]',filter='$query[filter]',cat_id=$query[cat_id],action='$query[action]/$query[action_id]',col_filter=".print_r($query['col_filter'],True).",sort=$query[sort],order=$query[order])

\n"; if (!isset($query['start'])) $query['start'] = 0; - if ($query['csv_export'] && $query['csv_export'] === true) - { - $query['csv_fields'] = $this->csv_export_fields($query['col_filter']['info_type']); - } // handle linked filter (show only entries linked to a certain other entry) if ($query['col_filter']['linked']) { @@ -860,7 +856,6 @@ class infolog_ui $values['action_title'] = $persist['action_title'] = $values['nm']['action_title'] = $action_title; $persist['called_as'] = $called_as; $persist['own_referer'] = $own_referer; - $values['nm']['csv_fields'] = true; // get set in get_rows to not include all custom fields // store whole $values[nm] in etemplate request unset($values['nm']['rows']);