From 98cc2c684c762252230786804d5cdf8b52d467a3 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 9 Mar 2007 06:01:02 +0000
Subject: [PATCH] invert the logic on getEventsIn to grab events that hang into
 and out of the time frame.  The same needs to be done to non-all day events

---
 lib/WebGUI/Asset/Wobject/Calendar.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm
index 1437c33e7..d357fd74f 100644
--- a/lib/WebGUI/Asset/Wobject/Calendar.pm
+++ b/lib/WebGUI/Asset/Wobject/Calendar.pm
@@ -630,8 +630,11 @@ sub getEventsIn {
                 ( 
                     Event.startTime IS NULL 
                     && Event.endTime IS NULL 
-                    && Event.startDate >= '$startDate' 
-                    && Event.startDate < '$endDate'
+                    && !
+                        (
+                            Event.startDate >= '$endDate' 
+                         || Event.endDate   <  '$startDate'
+                        )
                 ) 
                 || ( 
                     CONCAT(Event.startDate,' ',Event.startTime) >= '$startTz'