mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-05-20 19:05:25 +00:00
See ChangeLog
Monotone-Parent: fdd87c8990a184548d84798a93d2b2df80f30651 Monotone-Revision: fc98ebd698555332841f6988e47ba738f8e5e2da Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-03-21T18:24:06 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
@@ -596,7 +596,7 @@ static NSArray *commonSearchFields;
|
||||
- (EOQualifier *) _qualifierForFilter: (NSString *) filter
|
||||
{
|
||||
NSMutableArray *fields;
|
||||
NSString *searchFormat, *fieldFormat, *escapedFilter;
|
||||
NSString *fieldFormat, *searchFormat, *escapedFilter;
|
||||
EOQualifier *qualifier;
|
||||
NSMutableString *qs;
|
||||
|
||||
@@ -611,10 +611,10 @@ static NSArray *commonSearchFields;
|
||||
fieldFormat = [NSString stringWithFormat: @"(%%@='%@*')", escapedFilter];
|
||||
fields = [NSMutableArray arrayWithArray: searchFields];
|
||||
[fields addObjectsFromArray: mailFields];
|
||||
[fields addObject: CNField];
|
||||
searchFormat = [[[fields uniqueObjects] stringsWithFormat: fieldFormat]
|
||||
componentsJoinedByString: @" OR "];
|
||||
[qs appendFormat: @"(%@='%@*') OR %@",
|
||||
CNField, escapedFilter, searchFormat];
|
||||
[qs appendString: searchFormat];
|
||||
}
|
||||
|
||||
if (_filter && [_filter length])
|
||||
|
||||
Reference in New Issue
Block a user