Fix for bug #424854 - Holiday calculations not correct.

2001-05-18 00:18:17 +00:00 · 2001-05-18 00:18:17 +00:00 · 0340b45566
commit 0340b45566
parent cc14e680ae
1 changed files with 1 additions and 0 deletions
--- a/calendar/inc/class.calendar_holiday.inc.php
+++ b/calendar/inc/class.calendar_holiday.inc.php
@ -146,6 +146,7 @@ class calendar_holiday
 			{
 				$dow = $phpgw->calendar->day_of_week($this->year,$holiday['month'],1);
 				$day = (7 * $holiday['occurence'] - 6 + ($holiday['dow'] - $dow) % 7);
+				$day += ($day < 1 ? 7 : 0);
 			}
 			else
 			{