Merge pull request #271 from tfux/4988

fix(eas): properly encode DisplayTo (fixes #4995)
Alinto · Mar 30, 2020 · 841d689 · 841d689
2 parents 45eeb5f + 18ffd1a
commit 841d689
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m
@@ -894,7 +894,9 @@ - (NSString *) activeSyncRepresentationInContext: (WOContext *) _context
     {
       [s appendFormat: @"<To xmlns=\"Email:\">%@</To>", [value activeSyncRepresentationInContext: context]];
       // DisplayTo - If there are multiple display names, they are separated by semi-colons.
-      [s appendFormat: @"<DisplayTo xmlns=\"Email:\">%@</DisplayTo>", [self _personalNameFrom: [[self envelope] to]]];
+      value = [self _personalNameFrom: [[self envelope] to]];
+      if (value)
+        [s appendFormat: @"<DisplayTo xmlns=\"Email:\">%@</DisplayTo>", [value activeSyncRepresentationInContext: context]];
     }
 
   // From