From b08a362bd845c5dd55dcc39b6f1427910c80dab6 Mon Sep 17 00:00:00 2001
From: Frank Dillon <frank@plainblack.com>
Date: Tue, 27 Apr 2004 21:53:35 +0000
Subject: [PATCH] Fixed bug where dates from previous years were showing up on
 the calendar

---
 lib/WebGUI/Wobject/EventsCalendar.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/WebGUI/Wobject/EventsCalendar.pm b/lib/WebGUI/Wobject/EventsCalendar.pm
index 6c02472fb..fde8c5eba 100644
--- a/lib/WebGUI/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Wobject/EventsCalendar.pm
@@ -420,7 +420,7 @@ sub www_view {
 			# get event information
 			my $query = "select * from EventsCalendar_event where ";
 			$query .= " wobjectId=".$_[0]->get("wobjectId")." and " unless ($_[0]->get("isMaster"));
-			$query .= " (endDate>=$monthStart or endDate<=$monthEnd) and (startDate>=$monthStart or startDate<=$monthEnd) order by startDate,endDate";
+			$query .= " (endDate>=$monthStart and endDate<=$monthEnd) and (startDate>=$monthStart and startDate<=$monthEnd) order by startDate,endDate";
 			my %events;
 			my %previous;
 			my $sth = WebGUI::SQL->read($query);