From 982f6abf97517ba645a1cdc0552658df066408cc Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 4 Nov 2010 14:55:41 +0000 Subject: [PATCH] Monotone-Parent: a3184f032f327d5435e63f1c1a9a298908682dbd Monotone-Revision: e0e6c176d8cb78a7e264cc9d2f05c2cf5bfb77f5 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-11-04T14:55:41 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ Tools/SOGoSockDOperation.m | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b44dcdcfe..c295a459e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-11-04 Wolfgang Sourdeau + + * Tools/SOGoSockDOperation.m (_getFolderWithId:forUser:): invoke + -[SOGoParentFolder lookupPersonalFolder:ignoringRights:] directly, + in order to avoid a useless permission check. + 2010-11-03 Francis Lachapelle * UI/WebServerResources/SOGoDataTable.js (remove): we must diff --git a/Tools/SOGoSockDOperation.m b/Tools/SOGoSockDOperation.m index 82159751a..6e7057a34 100644 --- a/Tools/SOGoSockDOperation.m +++ b/Tools/SOGoSockDOperation.m @@ -235,7 +235,9 @@ Class SOGoContactSourceFolderKlass = Nil; userFolder = [SOGoUserFolder objectWithName: uid inContainer: nil]; parentFolder = [userFolder lookupName: @"Contacts" inContext: nil acquire: NO]; - folder = [parentFolder lookupName: folderId inContext: nil acquire: NO]; + /* Note that this prevent lookup on subscribed addressbooks. */ + folder = [parentFolder lookupPersonalFolder: folderId + ignoringRights: YES]; return folder; }