From 6f7e03bbd31d58a92e23609a2155d56bb7a7f24b Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 17 Feb 2011 22:12:04 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: 50142b417b19ad36d3c63bd36b61105185f0efc0 Monotone-Revision: 41bb79702e5e49315aa6313331d91aaf5357ff5f Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-02-17T22:12:04 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ SoObjects/Contacts/SOGoFolder+CardDAV.m | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 735ae6831..f8dea3890 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-02-17 Francis Lachapelle + + * SoObjects/Contacts/SOGoFolder+CardDAV.m (-parseContactFilter:): + we now consider all DOM elements from the text-match element. This + fixes problems when the query contains one or more HTML entities. + 2011-02-16 Francis Lachapelle * UI/WebServerResources/UIxPreferences.js (-appendSieveFilterRow): diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m index db9da4aef..2f62f1641 100644 --- a/SoObjects/Contacts/SOGoFolder+CardDAV.m +++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m @@ -1,6 +1,6 @@ /* NSObject+CardDAV.m - this file is part of SOGo * - * Copyright (C) 2007-2009 Inverse inc. + * Copyright (C) 2007-2011 Inverse inc. * * Author: Ludovic Marcotte * @@ -30,6 +30,7 @@ #import #import #import +#import #import #import @@ -142,8 +143,8 @@ && [(NSArray *) [[ranges objectAtIndex: 0] childNodes] count]) { filterData = [NSMutableDictionary dictionary]; - [filterData setObject: [[(NSArray *)[[ranges objectAtIndex: 0] childNodes] lastObject] data] - forKey: [filterElement attribute: @"name"]]; + [filterData setObject: [(NGDOMNode *)[ranges objectAtIndex: 0] textValue] + forKey: [filterElement attribute: @"name"]]; } }