From 1b4dca76f903ebb666d1f3d8d4458ce9c0088431 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 15 Mar 2010 18:43:11 +0000 Subject: [PATCH] Monotone-Parent: ff41de0005ad37b6858452da3e9c6d0cf21078af Monotone-Revision: 9bd966b224328d78fb14df7e0b5cca2b4e4e4bfb Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-03-15T18:43:11 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ SoObjects/SOGo/SOGoUserFolder.m | 8 +++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1185946f9..73709dd45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-03-15 Wolfgang Sourdeau + * SoObjects/SOGo/SOGoUserFolder.m (-davUsersQuery): we invoke + "prepareDAVResponse" only when there is content to return. + * UI/Scheduler/UIxCalListingActions.m (_fixDates:): the events appearing in the month view needs to have their dates fixed too. Also, the algorithm was lightly simplified. diff --git a/SoObjects/SOGo/SOGoUserFolder.m b/SoObjects/SOGo/SOGoUserFolder.m index f45e590d6..db8263f4f 100644 --- a/SoObjects/SOGo/SOGoUserFolder.m +++ b/SoObjects/SOGo/SOGoUserFolder.m @@ -469,15 +469,13 @@ NSString *content; r = [queryContext response]; - [r prepareDAVResponse]; document = [[context request] contentAsDOMDocument]; content = [self _davUsersFromQuery: document]; - if (content) + if ([content length]) { - [r setStatus: 207]; - if ([content length]) - [r appendContentString: content]; + [r prepareDAVResponse]; + [r appendContentString: content]; } else [r setStatus: 400];