From 05232526a7f84107f0379af0922898899ca33b0c Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 4 Jun 2015 11:46:59 -0400 Subject: [PATCH] (fix) small improvement over previous commit --- .../Appointments/SOGoAppointmentObject.m | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index 42bc57d55..ef56c917c 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -1802,7 +1802,6 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent { NSArray *allEvents; iCalEvent *event; - NSString *uid; NSUInteger i; allEvents = [rqCalendar events]; @@ -1828,16 +1827,21 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent // We now make sure that the organizer, if managed by SOGo, is using // its default email when creating events and inviting attendees. - uid = [[SOGoUserManager sharedUserManager] getUIDForEmail: [[event organizer] rfc822Email]]; - if (uid) + if ([event organizer]) { - NSDictionary *defaultIdentity; - SOGoUser *organizer; + NSString *uid; - organizer = [SOGoUser userWithLogin: uid]; - defaultIdentity = [organizer defaultIdentity]; - [[event organizer] setCn: [defaultIdentity objectForKey: @"fullName"]]; - [[event organizer] setEmail: [defaultIdentity objectForKey: @"email"]]; + uid = [[SOGoUserManager sharedUserManager] getUIDForEmail: [[event organizer] rfc822Email]]; + if (uid) + { + NSDictionary *defaultIdentity; + SOGoUser *organizer; + + organizer = [SOGoUser userWithLogin: uid]; + defaultIdentity = [organizer defaultIdentity]; + [[event organizer] setCn: [defaultIdentity objectForKey: @"fullName"]]; + [[event organizer] setEmail: [defaultIdentity objectForKey: @"email"]]; + } } } }