fix(calendar): ensure valid identity when sending invitations
parent
c99170b9bc
commit
c2d937746f
|
@ -1972,7 +1972,7 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
|
||||||
NSArray *allAttendees;
|
NSArray *allAttendees;
|
||||||
|
|
||||||
organizerUser = [SOGoUser userWithLogin: uid];
|
organizerUser = [SOGoUser userWithLogin: uid];
|
||||||
defaultIdentity = [organizerUser defaultIdentity];
|
defaultIdentity = [organizerUser primaryIdentity];
|
||||||
organizer = [[event organizer] copy];
|
organizer = [[event organizer] copy];
|
||||||
[organizer setCn: [defaultIdentity objectForKey: @"fullName"]];
|
[organizer setCn: [defaultIdentity objectForKey: @"fullName"]];
|
||||||
[organizer setEmail: [defaultIdentity objectForKey: @"email"]];
|
[organizer setEmail: [defaultIdentity objectForKey: @"email"]];
|
||||||
|
|
|
@ -828,7 +828,7 @@
|
||||||
|
|
||||||
// No organizer, grab the event's owner
|
// No organizer, grab the event's owner
|
||||||
if (![senderEmail length])
|
if (![senderEmail length])
|
||||||
senderEmail = shortSenderEmail = [[ownerUser defaultIdentity] objectForKey: @"email"];
|
senderEmail = shortSenderEmail = [[ownerUser primaryIdentity] objectForKey: @"email"];
|
||||||
|
|
||||||
/* calendar part */
|
/* calendar part */
|
||||||
eventBodyPart = [self _bodyPartForICalObject: object];
|
eventBodyPart = [self _bodyPartForICalObject: object];
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
iCalPerson *aAttendee;
|
iCalPerson *aAttendee;
|
||||||
|
|
||||||
ownerIdentity = [[SOGoUser userWithLogin: uid roles: nil]
|
ownerIdentity = [[SOGoUser userWithLogin: uid roles: nil]
|
||||||
defaultIdentity];
|
primaryIdentity];
|
||||||
aAttendee = [iCalPerson elementWithTag: @"attendee"];
|
aAttendee = [iCalPerson elementWithTag: @"attendee"];
|
||||||
[aAttendee setCn: [ownerIdentity objectForKey: @"fullName"]];
|
[aAttendee setCn: [ownerIdentity objectForKey: @"fullName"]];
|
||||||
[aAttendee setEmail: [ownerIdentity objectForKey: @"email"]];
|
[aAttendee setEmail: [ownerIdentity objectForKey: @"email"]];
|
||||||
|
|
Loading…
Reference in New Issue