From 3fa506f24a09c17d1b67a61203c2d6f3a0c7f808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= Date: Sun, 29 Nov 2009 21:02:15 +0000 Subject: [PATCH] Change calendar filter 'all' to include 'owner'; typo in get_recurrences() --- calendar/inc/class.calendar_so.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_so.inc.php b/calendar/inc/class.calendar_so.inc.php index 466993140a..f50a3defc1 100644 --- a/calendar/inc/class.calendar_so.inc.php +++ b/calendar/inc/class.calendar_so.inc.php @@ -338,7 +338,7 @@ class calendar_so 'cal_user_type' => $type, 'cal_user_id' => $ids, )); - if ($type == 'u' && $filter == 'owner') + if ($type == 'u' && ($filter == 'owner' || $filter == 'all')) { $cal_table_def = $this->db->get_table_definitions('calendar',$this->cal_table); $to_or[] = $this->db->expression($cal_table_def,array('cal_owner' => $ids)); @@ -1381,7 +1381,7 @@ ORDER BY cal_user_type, cal_usre_id $participant_status = array(); $where = array('cal_id' => $cal_id); if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')'; - if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date =< ' . (int)$end . ')'; + if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')'; if ($start != 0 && $end != 0) { $where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start . @@ -1398,7 +1398,7 @@ ORDER BY cal_user_type, cal_usre_id 'cal_user_id' => $user_id, ); if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')'; - if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date =< ' . (int)$end . ')'; + if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')'; if ($start != 0 && $end != 0) { $where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .