From d41940fc1f56353b817d4bdf8b056b979f6fdf3b Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 15 Apr 2010 13:23:16 +0000 Subject: [PATCH] work in progress, forgot that ressources are user_types too --- calendar/inc/class.calendar_so.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php index 67df3cb1ff..8156fb7c12 100644 --- a/calendar/inc/class.calendar_so.inc.php +++ b/calendar/inc/class.calendar_so.inc.php @@ -365,7 +365,7 @@ class calendar_so } } $to_or = $user_or = $owner_or = array(); - $useUnionQuery = $this->db->capabilities['distinct_on_text'] && $this->db->capabilities['union']; + $useUnionQuery = false; //= $this->db->capabilities['distinct_on_text'] && $this->db->capabilities['union']; $table_def = $this->db->get_table_definitions('calendar',$this->user_table); foreach($users_by_type as $type => $ids) { @@ -432,7 +432,7 @@ class calendar_so if ($end) $where[] = 'cal_start < '.(int)$end; if (!preg_match('/^[a-z_ ,]+$/i',$order)) $order = 'cal_start'; // gard against SQL injection - +$useUnionQuery = $this->db->capabilities['distinct_on_text'] && $this->db->capabilities['union']; if ($useUnionQuery) { // allow apps to supply participants and/or icons