projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #22669 from agileware/CIVICRM-1921
[civicrm-core.git]
/
CRM
/
Core
/
OptionValue.php
diff --git
a/CRM/Core/OptionValue.php
b/CRM/Core/OptionValue.php
index 79e6216c555c8ab74f985532f10a8db86449ec15..e1219e982e8485ff5aa576b5d0f6ec29f2818b74 100644
(file)
--- a/
CRM/Core/OptionValue.php
+++ b/
CRM/Core/OptionValue.php
@@
-82,7
+82,7
@@
class CRM_Core_OptionValue {
if ($optionGroupID) {
$dao->option_group_id = $optionGroupID;
if ($optionGroupID) {
$dao->option_group_id = $optionGroupID;
- if (
in_array($groupName, CRM_Core_OptionGroup::$_domainIDGroups
)) {
+ if (
CRM_Core_OptionGroup::isDomainOptionGroup($groupName
)) {
$dao->domain_id = CRM_Core_Config::domainID();
}
$dao->domain_id = CRM_Core_Config::domainID();
}
@@
-438,7
+438,7
@@
FROM
$params[2] = [$groupName, 'String'];
}
$params[2] = [$groupName, 'String'];
}
- if (
in_array($groupName, CRM_Core_OptionGroup::$_domainIDGroups
)) {
+ if (
CRM_Core_OptionGroup::isDomainOptionGroup($groupName
)) {
$where .= " AND option_value.domain_id = " . CRM_Core_Config::domainID();
}
$where .= " AND option_value.domain_id = " . CRM_Core_Config::domainID();
}
@@
-457,7
+457,7
@@
FROM
'is_active' => $dao->is_active,
'is_default' => $dao->is_default,
'icon' => $dao->icon,
'is_active' => $dao->is_active,
'is_default' => $dao->is_default,
'icon' => $dao->icon,
- 'color' => $dao->
icon
,
+ 'color' => $dao->
color
,
];
}
return $values;
];
}
return $values;