only do the integration query, if currentapp is calendar, because of performance issues thereof (addressbook fetches the last calendar event(, which fetchs the infologs))

This commit is contained in:
Klaus Leithoff 2010-02-02 13:29:51 +00:00
parent 37b190e82e
commit f9a3ab52dc

View File

@ -558,7 +558,7 @@ class calendar_so
*/ */
private static function get_union_selects(array &$selects,$start,$end,$users,$cat_id,$filter,$query) 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, ... return; // disable integration for GroupDAV, SyncML, ...
} }