From 80d323a04f085cc9200d5f74a6af5020044f29be Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 5 Apr 2021 19:40:06 -0400
Subject: [PATCH] dev/core#2488 - When setting default optionValue, limit query
 to specified domain

---
 CRM/Core/BAO/OptionValue.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/BAO/OptionValue.php b/CRM/Core/BAO/OptionValue.php
index 8b8f669389..4e3a22533d 100644
--- a/CRM/Core/BAO/OptionValue.php
+++ b/CRM/Core/BAO/OptionValue.php
@@ -169,6 +169,12 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue {
     $optionValue = new CRM_Core_DAO_OptionValue();
     $optionValue->copyValues($params);
 
+    $isDomainOptionGroup = in_array($groupName, CRM_Core_OptionGroup::$_domainIDGroups);
+    if (empty($params['domain_id']) && $isDomainOptionGroup) {
+      $optionValue->domain_id = CRM_Core_Config::domainID();
+    }
+
+    // When setting a default option, unset other options in this group as default
     if (!empty($params['is_default'])) {
       $query = 'UPDATE civicrm_option_value SET is_default = 0 WHERE  option_group_id = %1';
 
@@ -182,11 +188,18 @@ class CRM_Core_BAO_OptionValue extends CRM_Core_DAO_OptionValue {
       }
 
       $p = [1 => [$params['option_group_id'], 'Integer']];
-      CRM_Core_DAO::executeQuery($query, $p);
-    }
 
-    if (empty($params['domain_id']) && in_array($groupName, CRM_Core_OptionGroup::$_domainIDGroups)) {
-      $optionValue->domain_id = CRM_Core_Config::domainID();
+      // Limit update by domain of option
+      $domain = $optionValue->domain_id ?? NULL;
+      if (!$domain && $id && $isDomainOptionGroup) {
+        $domain = CRM_Core_DAO::getFieldValue(__CLASS__, $id, 'domain_id');
+      }
+      if ($domain) {
+        $query .= ' AND domain_id = %2';
+        $p[2] = [$domain, 'Integer'];
+      }
+
+      CRM_Core_DAO::executeQuery($query, $p);
     }
 
     $groupsSupportingDuplicateValues = ['languages'];
-- 
2.25.1