Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13538/phpicalendar/functions
Modified Files:
ical_parser.php
Log Message:
bug fix for repeating events where first day of month is same as repeat day
Index: ical_parser.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/ical_parser.php,v
retrieving revision 1.214
retrieving revision 1.215
diff -C2 -d -r1.214 -r1.215
*** ical_parser.php 25 Jul 2006 00:57:19 -0000 1.214
--- ical_parser.php 2 Nov 2006 08:06:03 -0000 1.215
***************
*** 661,665 ****
$next_range_time = strtotime(date('Y-m-'.$last_day_tmp, $next_range_time));
$last_tmp = (date('w',$next_range_time) == $on_day_num) ? '' : 'last ';
! $next_date_time = strtotime($last_tmp.$on_day.' -'.$nth.' week', $next_range_time);
$month = date('m', $next_date_time);
if (in_array($month, $bymonth)) {
--- 661,665 ----
$next_range_time = strtotime(date('Y-m-'.$last_day_tmp, $next_range_time));
$last_tmp = (date('w',$next_range_time) == $on_day_num) ? '' : 'last ';
! $next_date_time = strtotime($last_tmp.$on_day, $next_range_time) - $nth * 604800;
$month = date('m', $next_date_time);
if (in_array($month, $bymonth)) {
***************
*** 683,687 ****
}
} elseif ((isset($byday_arr[1])) && ($byday_arr[1] != '-')) {
! $next_date_time = strtotime($on_day.' +'.$nth.' week', $next_range_time);
$month = date('m', $next_date_time);
if (in_array($month, $bymonth)) {
--- 683,687 ----
}
} elseif ((isset($byday_arr[1])) && ($byday_arr[1] != '-')) {
! $next_date_time = strtotime($on_day, $next_range_time) + $nth * 604800;
$month = date('m', $next_date_time);
if (in_array($month, $bymonth)) {
|
