From b88f5cb446436145ef3f572df6c87d574969f9dd Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 15 Nov 2018 17:44:42 +0100 Subject: [PATCH] Do not run read_calendar if there's no columnselection at all --- addressbook/inc/class.addressbook_ui.inc.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index f11fd8a88a..bd04398d95 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -1803,7 +1803,9 @@ window.egw_LAB.wait(function() { } $customfields = $this->read_customfields($ids,$selected_cfs); } - if ($show_calendar && !empty($ids)) $calendar = $this->read_calendar($calendar_participants); + // TODO: we need to find out where the csv_export query has been used and try to clean up + // this columnselection condition statements. + if ($columselection && $show_calendar && !empty($ids)) $calendar = $this->read_calendar($calendar_participants); // distributionlist memership for the entrys //_debug_array($this->get_lists(Acl::EDIT)); if ($show_distributionlist && $available_distib_lists)