From d18c8b3fda229979d8e63f2a316835791628c259 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 18 Sep 2012 11:39:00 +0000 Subject: [PATCH] removed usage of MCAL_ constants in favor of own class-constants --- calendar/inc/class.calendar_rrule.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_rrule.inc.php b/calendar/inc/class.calendar_rrule.inc.php index 6e5bbad770..0442e30955 100644 --- a/calendar/inc/class.calendar_rrule.inc.php +++ b/calendar/inc/class.calendar_rrule.inc.php @@ -541,7 +541,7 @@ class calendar_rrule implements Iterator * * $return array vCalendar RRULE */ - public function generate_rrule($version='1.0') + public function generate_rrule($version='2.0') { $repeat_days = array(); $rrule = array(); @@ -601,7 +601,7 @@ class calendar_rrule implements Iterator $rrule['BYMONTHDAY'] = $this->monthly_bymonthday; break; - case MCAL_RECUR_MONTHLY_WDAY: // weekday of the month: BDAY={1..5}{MO..SO} + case self::MONTHLY_WDAY: // weekday of the month: BDAY={1..5}{MO..SO} $rrule['BYDAY'] = $this->monthly_byday_num . strtoupper(substr($this->time->format('l'),0,2)); break; @@ -697,7 +697,7 @@ class calendar_rrule implements Iterator if (!is_array($event) || !isset($event['recur_type']) || - $event['recur_type'] == MCAL_RECUR_NONE || + $event['recur_type'] == self::NONE || empty($event['recur_data']) || $event['recur_data'] == ALLDAYS || empty($event['tzid']) || empty($to_tz) || $event['tzid'] == $to_tz) return;