From f9a3ab52dc32844243ea62c7cf220e79d8bd0f32 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Tue, 2 Feb 2010 13:29:51 +0000 Subject: [PATCH] only do the integration query, if currentapp is calendar, because of performance issues thereof (addressbook fetches the last calendar event(, which fetchs the infologs)) --- calendar/inc/class.calendar_so.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php index 4e0a768275..1a5094a132 100644 --- a/calendar/inc/class.calendar_so.inc.php +++ b/calendar/inc/class.calendar_so.inc.php @@ -558,7 +558,7 @@ class calendar_so */ private static function get_union_selects(array &$selects,$start,$end,$users,$cat_id,$filter,$query) { - if (in_array(basename($_SERVER['SCRIPT_FILENAME']),array('groupdav.php','rpc.php','xmlrpc.php'))) + if (in_array(basename($_SERVER['SCRIPT_FILENAME']),array('groupdav.php','rpc.php','xmlrpc.php')) || $GLOBALS['egw_info']['flags']['currentapp'] != 'calendar') { return; // disable integration for GroupDAV, SyncML, ... }