From 9995ccc29fb4488492b784106eb83a59fca10686 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 24 Mar 2017 11:37:54 -0400
Subject: [PATCH] (fix) more fixes for #3905

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

diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 8baeefee3..e2145370d 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -1810,9 +1810,11 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
             {
 	      iCalPerson *attendee, *organizer;
               NSDictionary *defaultIdentity;
+	      SOGoUser *organizerUser;
 	      NSArray *allAttendees;
 
-              defaultIdentity = [[SOGoUser userWithLogin: uid] defaultIdentity];
+	      organizerUser = [SOGoUser userWithLogin: uid];
+              defaultIdentity = [organizerUser defaultIdentity];
 	      organizer = [[event organizer] copy];
               [organizer setCn: [defaultIdentity objectForKey: @"fullName"]];
               [organizer setEmail: [defaultIdentity objectForKey: @"email"]];
@@ -1825,7 +1827,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
 	      for (j = [allAttendees count]-1; j >= 0; j--)
 		{
 		  attendee = [allAttendees objectAtIndex: j];
-		  if ([organizer hasEmail: [attendee rfc822Email]])
+		  if ([organizerUser hasEmail: [attendee rfc822Email]])
 		    [event removeFromAttendees: attendee];
 		}