From d1cb08fd0f7f01040eff0f06e5f677d383124aab Mon Sep 17 00:00:00 2001
From: David Reedy Jr <davidrjr.konadave@gmail.com>
Date: Mon, 28 Mar 2022 15:15:48 -0500
Subject: [PATCH] Don't lose search criteria on edit of smart group build with
 search builder

---
 CRM/Core/BAO/Mapping.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
index d0af287f500d..373c61a9f039 100644
--- a/CRM/Core/BAO/Mapping.php
+++ b/CRM/Core/BAO/Mapping.php
@@ -197,7 +197,7 @@ public static function getMappingFields($mappingId, $addPrimary = FALSE) {
         $mappingOperator[$mapping->grouping][$mapping->column_number] = $mapping->operator;
       }
 
-      if (!empty($mapping->value)) {
+      if (isset($mapping->value)) {
         $mappingValue[$mapping->grouping][$mapping->column_number] = $mapping->value;
       }
     }
@@ -935,7 +935,7 @@ protected static function loadSavedMapping($mappingLocation, int $x, int $i, $ma
           $defaults["operator[$x][$i]"] = $mappingOperator[$x][$i] ?? NULL;
         }
 
-        if (CRM_Utils_Array::value($i, CRM_Utils_Array::value($x, $mappingValue))) {
+        if (isset($mappingValue[$x][$i])) {
           $defaults["value[$x][$i]"] = $mappingValue[$x][$i] ?? NULL;
         }
       }