From 59c3bdc2422cd893e9cc068231105e7ff4fec5e6 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 22 Oct 2018 11:20:06 -0400
Subject: [PATCH] Fix time conflict validation

---
 SoObjects/Appointments/SOGoAppointmentObject.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 661d823cc..b30c63483 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -660,7 +660,7 @@
         }
 
       fb = [SOGoFreeBusyObject objectWithName: @"freebusy.ifb" inContainer: [user homeFolderInContext: context]];
-      fbInfo = [fb fetchFreeBusyInfosFrom: start to: end];
+      fbInfo = (NSMutableArray *)[fb fetchFreeBusyInfosFrom: start to: end];
 
       //
       // We must also check here for repetitive events that don't overlap our event.
@@ -804,7 +804,7 @@
                   if ([[o objectForKey: @"startDate"] isDateOnSameDay: end])
                     formattedEnd = [formatter formattedTime: end];
                   else
-                    [formatter formattedDateAndTime: end];
+                    formattedEnd = [formatter formattedDateAndTime: end];
 
                   [conflicts addObject: [NSDictionary dictionaryWithObjectsAndKeys: [formatter formattedDateAndTime: [o objectForKey: @"startDate"]], @"startDate",
                                                       formattedEnd, @"endDate", nil]];