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 #14131 from colemanw/resourceList
[civicrm-core.git]
/
CRM
/
Core
/
OptionGroup.php
diff --git
a/CRM/Core/OptionGroup.php
b/CRM/Core/OptionGroup.php
index 94368ec6a30a3586f9d90e298ac8badb6b098e3f..913f874d50b6c903b3311c3024f2e31d41b6bb38 100644
(file)
--- a/
CRM/Core/OptionGroup.php
+++ b/
CRM/Core/OptionGroup.php
@@
-31,14
+31,15
@@
* @copyright CiviCRM LLC (c) 2004-2019
*/
class CRM_Core_OptionGroup {
* @copyright CiviCRM LLC (c) 2004-2019
*/
class CRM_Core_OptionGroup {
- static $_values = [];
- static $_cache = [];
+
public
static $_values = [];
+
public
static $_cache = [];
/**
* $_domainIDGroups array maintains the list of option groups for whom
* domainID is to be considered.
/**
* $_domainIDGroups array maintains the list of option groups for whom
* domainID is to be considered.
+ * @var array
*/
*/
- static $_domainIDGroups = [
+
public
static $_domainIDGroups = [
'from_email_address',
'grant_type',
];
'from_email_address',
'grant_type',
];
@@
-615,13
+616,13
@@
WHERE v.option_group_id = g.id
if ($dao->fetch()) {
foreach ([
if ($dao->fetch()) {
foreach ([
-
'id',
-
'name',
-
'value',
-
'label',
-
'weight',
-
'description',
-
] as $fld) {
+ 'id',
+ 'name',
+ 'value',
+ 'label',
+ 'weight',
+ 'description',
+ ] as $fld) {
$row[$fld] = $dao->$fld;
if ($localize && in_array($fld, ['label', 'description'])) {
$row[$fld] = ts($row[$fld]);
$row[$fld] = $dao->$fld;
if ($localize && in_array($fld, ['label', 'description'])) {
$row[$fld] = ts($row[$fld]);