From 0d919dbd022e498bdb73a2d39f3fffad5c726190 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 6 Nov 2015 08:56:23 -0500 Subject: [PATCH] (fix) small fixes --- ActiveSync/SOGoActiveSyncDispatcher.m | 2 +- SoObjects/SOGo/SOGoCacheGCSObject.m | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ActiveSync/SOGoActiveSyncDispatcher.m b/ActiveSync/SOGoActiveSyncDispatcher.m index 013a4a226..e9300b3ce 100644 --- a/ActiveSync/SOGoActiveSyncDispatcher.m +++ b/ActiveSync/SOGoActiveSyncDispatcher.m @@ -2590,7 +2590,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. email = [identity objectForKey: @"email"]; if ([fullName length]) - new_from_header = [[NSString stringWithFormat: @"From: %@ <%@>\r\n", fullName, email] dataUsingEncoding:NSUTF8StringEncoding]; + new_from_header = [[NSString stringWithFormat: @"From: %@ <%@>\r\n", [fullName asQPSubjectString: @"utf-8"], email] dataUsingEncoding:NSUTF8StringEncoding]; else new_from_header = [[NSString stringWithFormat: @"From: %@\r\n", email] dataUsingEncoding:NSUTF8StringEncoding]; diff --git a/SoObjects/SOGo/SOGoCacheGCSObject.m b/SoObjects/SOGo/SOGoCacheGCSObject.m index ed2d33f52..a6a5c52a3 100644 --- a/SoObjects/SOGo/SOGoCacheGCSObject.m +++ b/SoObjects/SOGo/SOGoCacheGCSObject.m @@ -431,7 +431,7 @@ static EOAttribute *textColumn = nil; [sql appendFormat: @" AND c_version > %d", (int)startVersion]; if (deviceId) { - pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@", deviceId] + pathValue = [adaptor formatValue: [NSString stringWithFormat: @"/%@%", deviceId] forAttribute: textColumn]; [sql appendFormat: @" AND c_path like %@", pathValue]; }