amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-22 14:52:44 +00:00
Code Issues Projects Releases Wiki Activity

(fix) more fixes for #3905

Browse Source
This commit is contained in:
Ludovic Marcotte
2017-03-24 11:11:10 -04:00
parent cf07f5746c
commit f1cc36b533
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SoObjects/Appointments/SOGoAppointmentObject.m
View File

@@ -1850,16 +1850,14 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
uid = [[event organizer] uidInContext: context];
if (uid)
{
iCalPerson *attendee, *organizer;
NSDictionary *defaultIdentity;
NSArray *allAttendees;
iCalPerson *attendee;
SOGoUser *organizer;
organizer = [SOGoUser userWithLogin: uid];
defaultIdentity = [organizer defaultIdentity];
[[event organizer] setCn: [defaultIdentity objectForKey: @"fullName"]];
[[event organizer] setEmail: [defaultIdentity objectForKey: @"email"]];
defaultIdentity = [[SOGoUser userWithLogin: uid] defaultIdentity];
organizer = [[event organizer] copy];
[organizer setCn: [defaultIdentity objectForKey: @"fullName"]];
[organizer setEmail: [defaultIdentity objectForKey: @"email"]];
// We now check if one of the attendee is also the organizer. If so,
// we remove it. See bug #3905 (https://sogo.nu/bugs/view.php?id=3905)
@@ -1872,6 +1870,10 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
if ([organizer hasEmail: [attendee rfc822Email]])
[event removeFromAttendees: attendee];
}
// We reset the organizer
[event setOrganizer: organizer];
RELEASE(organizer);
}
}
}