holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Looks like it was improperly calculating holidays occuring on a sliding monday.

Browse Source
This commit is contained in:
skeeter 2002-01-13 14:39:05 +00:00
parent 25c4b80150
commit 3514763523
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/inc/class.holidaycalc_US.inc.php
View File

@ -23,8 +23,9 @@ class holidaycalc {
if($holiday['occurence'] != 99)
{
$dow = $datetime->day_of_week($year,$holiday['month'],1);
$day = (7 * $holiday['occurence'] - 6 + ($holiday['dow'] - $dow) % 7);
$day = (((7 * $holiday['occurence']) - 6) + (($holiday['dow'] - $dow) % 7));
$day += ($day < 1 ? 7 : 0);
$day += ($holiday['dow']==1 ? 7 : 0);
}
else
{