Fix Announcement Filtering

Changes to Announcement filters in getAnnouncementClass() and
UpcomingAnnouncements()

code/Calendar.php

@@ -179,11 +179,9 @@ public function getEventList($start, $end, $filter = null, $limit = null, $annou
 
 			$announcements = DataList::create($this->getAnnouncementClass())
 				->filter(array(
-					"CalendarID" => $calendar->ID
-				))
-				->exclude(array(				
-					"StartDate:LessThan" => $start,
-					"EndDate:GreaterThan" => $end,
+					"CalendarID" => $calendar->ID,				
+					"StartDate:LessThan:Not" => $start,
+					"EndDate:GreaterThan:Not" => $end,
 				));
 			if($announcement_filter) {
 				$announcements = $announcements->where($announcement_filter);
@@ -411,7 +409,7 @@ public function UpcomingEvents($limit = 5, $filter = null)  {
 	public function UpcomingAnnouncements($limit = 5, $filter = null) {
 		return $this->Announcements()
 			->filter(array(
-				'StartDate:GreaterThan' => 'DATE(NOW())'
+				'StartDate:GreaterThan' => 'NOW'
 			))
 			->where($filter)
 			->limit($limit);