propagate from branch 'ca.inverse.sogo.1_3_15' (head af017f174df00d4475a8c99168a6d994257a1ca8)

to branch 'ca.inverse.sogo' (head 7988c89da6f982bafb73b22f935b081b7178d1c4)

Monotone-Parent: 7988c89da6f982bafb73b22f935b081b7178d1c4
Monotone-Parent: af017f174df00d4475a8c99168a6d994257a1ca8
Monotone-Revision: 12c967642fd34ef7dfd09d28c886260b0bb94796

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-04-13T14:02:35
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-04-13 14:02:35 +00:00
2 changed files with 8 additions and 2 deletions
+6
View File
@@ -1,3 +1,9 @@
2012-04-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m (-bareFetchFields: ...),
(-fetchFields:from:to:title:component:additionalFilters:includeProtectedInformation:):
restored c-style escaping of sql-style escaping of quote characters.
2012-04-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoGCSFolder.m (-componentSQLFilter): new
@@ -553,7 +553,7 @@ static NSNumber *sharedYes = nil;
if ([title length])
[baseWhere
addObject: [NSString stringWithFormat: @"c_title isCaseInsensitiveLike: '%%%@%%'",
[title stringByReplacingString: @"'" withString: @"''"]]];
[title stringByReplacingString: @"'" withString: @"\\'\\'"]]];
if (component)
{
@@ -1150,7 +1150,7 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
if ([title length])
[baseWhere
addObject: [NSString stringWithFormat: @"c_title isCaseInsensitiveLike: '%%%@%%'",
[title stringByReplacingString: @"'" withString: @"''"]]];
[title stringByReplacingString: @"'" withString: @"\\'\\'"]]];
if ([filters length])
[baseWhere addObject: [NSString stringWithFormat: @"(%@)", filters]];