From 4b7b1909fd5c3bc370263f04d8f001639a9d7ff0 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 7 Jun 2019 18:52:33 +1200
Subject: [PATCH] Move sort_name definition to searchFieldMetadata

---
 CRM/Contact/Form/Search/Criteria.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 1a533342a0..18884ac5b8 100644
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -275,7 +275,13 @@ class CRM_Contact_Form_Search_Criteria {
    * @param CRM_Core_Form $form
    */
   protected static function setBasicSearchFields($form) {
-    $form->assign('basicSearchFields', self::getBasicSearchFields());
+    $searchFields = [];
+    foreach (self::getSearchFieldMetadata() as $fieldName => $field) {
+      if ($field['template_grouping'] === 'basic') {
+        $searchFields[$fieldName] = $field;
+      }
+    }
+    $form->assign('basicSearchFields', array_merge(self::getBasicSearchFields(), $searchFields));
   }
 
   /**
@@ -285,7 +291,6 @@ class CRM_Contact_Form_Search_Criteria {
   public static function getBasicSearchFields() {
     $userFramework = CRM_Core_Config::singleton()->userFramework;
     return [
-      'sort_name' => ['name' => 'sort_name'],
       'email' => ['name' => 'email'],
       'contact_type' => ['name' => 'contact_type'],
       'group' => [
-- 
2.25.1