Merge pull request #23052 from konadave/r25088

Don't lose search criteria for smart group built with search builder
civicrm · Apr 4, 2022 · 61e00c4 · 61e00c4
2 parents b38b96c + d1cb08f
commit 61e00c4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;
         }
       }