Merge branch 'master' into feature-5726-gab-autocomplete

This commit is contained in:
smizrahi committed 2023-11-27 11:18:31 +01:00
commit 60e6bb5b3b
16 files changed
+173 -39

No files matched your search

+1 -1
View File
@@ -418,7 +418,7 @@ convention:
[self setCategories: [o componentsSeparatedByString: @","]];
// Photo
if ([ldifRecord objectForKey: @"photo"])
if ([ldifRecord objectForKey: @"photo"] && [ldifRecord objectForKey: @"photo"] != [NSNull null])
[self setPhoto: [[ldifRecord objectForKey: @"photo"] stringByEncodingBase64]];
[self cleanupEmptyChildren];