From 05e20a6751821ee4b34471eee2431932e8fe9456 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 5 Jul 2011 15:08:44 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: 0a26aa3104394fc27aedec6025fb6d01075058b4 Monotone-Revision: 6a276a3a3ea0a9b3f1f8f69464b4b6058b639b18 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-07-05T15:08:44 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/Appointments/SOGoAppointmentObject.m | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5d54c092d..5e85fa1fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ update the right event in the database in order to update major properties coming from external invitations during updates. + * SoObjects/Appointments/SOGoAppointmentObject.m (-PUTAction:) + We check if uid is not nil prior comparing it to the + owner. This fixes bug #1323 2011-07-02 Ludovic Marcotte diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m index d4e5f3ca8..932f952e0 100644 --- a/SoObjects/Appointments/SOGoAppointmentObject.m +++ b/SoObjects/Appointments/SOGoAppointmentObject.m @@ -1809,7 +1809,7 @@ else uid = [[[[[newEvent parent] events] objectAtIndex: 0] organizer] uid]; - if ([uid caseInsensitiveCompare: owner] == NSOrderedSame) + if (uid && [uid caseInsensitiveCompare: owner] == NSOrderedSame) { if ((ex = [self _handleUpdatedEvent: newEvent fromOldEvent: oldEvent])) return ex;