Merge pull request #3797 from Citadel-Station-13/upstream-merge-32329

[MIRROR] Some improvements on the holiday system
2017-11-04 22:49:49 -05:00
parent 45bd77f11a 5f02de7b1b
commit cf83d3410b
2 changed files with 2 additions and 2 deletions
@@ -33,7 +33,7 @@
 	if(!end_month)
 		end_month = begin_month
 	if(begin_week && begin_weekday)
-		if(begin_week == ww && begin_weekday == ddd)
+		if(begin_week == ww && begin_weekday == ddd && begin_month == mm)
 			return TRUE
 	if(end_month > begin_month) //holiday spans multiple months in one year
 		if(mm == end_month) //in final month