From e8b29add3a42b6b4be89756cdf80c47d767ee43b Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 22 Nov 2017 09:26:57 -0500
Subject: [PATCH] Fix calls to fetchContactsMatching:

---
 SoObjects/Contacts/SOGoFolder+CardDAV.m | 2 +-
 SoObjects/SOGo/SOGoUserManager.m        | 1 +
 Tools/SOGoSockDOperation.m              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index e6e146416..2a600a8d1 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -100,7 +100,7 @@
       currentFilter = [filters objectAtIndex: count];
       contacts =
         [[(id<SOGoContactFolder>)self lookupContactsWithFilter: [[currentFilter allValues] lastObject]
-                                                    onCriteria: @"name_or_address"
+                                                    onCriteria: nil
                                                         sortBy: @"c_givenname"
                                                       ordering: NSOrderedDescending
                                                       inDomain: domain] objectEnumerator];
diff --git a/SoObjects/SOGo/SOGoUserManager.m b/SoObjects/SOGo/SOGoUserManager.m
index 7b7a281af..1ee92efef 100644
--- a/SoObjects/SOGo/SOGoUserManager.m
+++ b/SoObjects/SOGo/SOGoUserManager.m
@@ -1205,6 +1205,7 @@ static Class NSNullK;
       currentSource = [_sources objectForKey: sourceID];
       [contacts addObjectsFromArray:
                   [currentSource fetchContactsMatching: filter
+                                          withCriteria: nil
                                               inDomain: domain]];
     }
 
diff --git a/Tools/SOGoSockDOperation.m b/Tools/SOGoSockDOperation.m
index 1aff39b31..86a272005 100644
--- a/Tools/SOGoSockDOperation.m
+++ b/Tools/SOGoSockDOperation.m
@@ -270,7 +270,7 @@ Class SOGoContactSourceFolderKlass = Nil;
                     filter = @".";
                   resultEntries
                     = [folder lookupContactsWithFilter: filter
-                                            onCriteria: @"name_or_address"
+                                            onCriteria: nil
                                                 sortBy: @"c_cn"
                                               ordering: NSOrderedAscending
                                               inDomain: nil];