mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-19 14:25:21 +00:00
Merge branch 'master' into feature-5726-gab-autocomplete
This commit is contained in:
commit
60e6bb5b3b
16 files changed
+173
-39
No files matched your search
@@ -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];
|
||||
|
||||
Reference in new issue
Block a user