mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-27 07:42:49 +01:00
Fix for bug #424854 - Holiday calculations not correct.
This commit is contained in:
parent
cc14e680ae
commit
0340b45566
@ -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
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user