diff options
| author | Jim Hu <jimhu@users.sourceforge.net> | 2005-12-02 17:18:31 +0000 |
|---|---|---|
| committer | Jim Hu <jimhu@users.sourceforge.net> | 2005-12-02 17:18:31 +0000 |
| commit | 613d019259721d83c888e7dd94872052263a6104 (patch) | |
| tree | 1bee5cfc5dd340c63c64fea0ca60e1d288dc0f18 /functions | |
| parent | 20030121c4fc988b94418561191bd9784b9cfd29 (diff) | |
| download | phpicalendar-613d019259721d83c888e7dd94872052263a6104.tar.gz phpicalendar-613d019259721d83c888e7dd94872052263a6104.tar.bz2 phpicalendar-613d019259721d83c888e7dd94872052263a6104.zip | |
fix for calculation of negative byday events
Diffstat (limited to 'functions')
| -rw-r--r-- | functions/date_functions.php | 2 | ||||
| -rw-r--r-- | functions/ical_parser.php | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/functions/date_functions.php b/functions/date_functions.php index f6bfd53..482e449 100644 --- a/functions/date_functions.php +++ b/functions/date_functions.php @@ -220,7 +220,7 @@ function extractDateTime($data, $property, $field) { unset($unixtime, $date, $time, $allday); // What the heck is this doing in here? - $data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); + #$data = str_replace ('/softwarestudio.org/Olson_20011030_5/', '', $data); // Check for zulu time. $zulu_time = false; diff --git a/functions/ical_parser.php b/functions/ical_parser.php index 5119a1a..831a4a5 100644 --- a/functions/ical_parser.php +++ b/functions/ical_parser.php @@ -562,6 +562,9 @@ foreach ($cal_filelist as $filename) { if (in_array($month, $bymonth)) { $recur_data[] = $next_date_time; } + #reset next_range_time to start of month + $next_range_time = strtotime(date('Y-m-'.'1', $next_range_time)); + } elseif (isset($bymonthday) && (!empty($bymonthday))) { // This supports MONTHLY where BYDAY and BYMONTH are both set foreach($bymonthday as $day) { |