From 1528dc4dd0dbc4f9f54c64099f3ec2efb91ed2cf Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 24 Jan 2018 11:58:55 -0500
Subject: [PATCH] Improve contacts search when no scope is set

---
 UI/Contacts/UIxContactsListActions.m | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/UI/Contacts/UIxContactsListActions.m b/UI/Contacts/UIxContactsListActions.m
index 1a1939d28..c3e0372b2 100644
--- a/UI/Contacts/UIxContactsListActions.m
+++ b/UI/Contacts/UIxContactsListActions.m
@@ -148,8 +148,6 @@
   NSUInteger max, count;
   unsigned int i;
 
-  [self saveSortValue];
-
   if (!contactInfos)
     {
       folder = [self clientObject];
@@ -160,12 +158,10 @@
 		  ? NSOrderedAscending : NSOrderedDescending);
 
       searchFields = [data objectForKey: @"search"];
-      if ([searchFields isKindOfClass: [NSArray class]] && [searchFields count] > 0)
-	valueText = [data objectForKey: @"value"];
-      else
+      valueText = [data objectForKey: @"value"];
+      if (![searchFields isKindOfClass: [NSArray class]] || ![searchFields count] > 0)
         {
           searchFields = nil;
-          valueText = nil;
         }
 
       excludeLists = [[data objectForKey: @"excludeLists"] boolValue];