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 #18365 from eileenmcnaughton/member
[civicrm-core.git]
/
Civi
/
Core
/
SettingsManager.php
diff --git
a/Civi/Core/SettingsManager.php
b/Civi/Core/SettingsManager.php
index 46d9b7bb35e68c288aff54957cffcb780e69b4bf..1bd096758a0a576ec080b51ed21e46d0514fdeff 100644
(file)
--- a/
Civi/Core/SettingsManager.php
+++ b/
Civi/Core/SettingsManager.php
@@
-221,7
+221,7
@@
class SettingsManager {
]);
$defaults = [];
foreach ($specs as $key => $spec) {
]);
$defaults = [];
foreach ($specs as $key => $spec) {
- $defaults[$key] =
\CRM_Utils_Array::value('default', $spec)
;
+ $defaults[$key] =
$spec['default'] ?? NULL
;
}
\CRM_Utils_Array::extend($defaults, self::getSystemDefaults($entity));
$this->cache->set($cacheKey, $defaults);
}
\CRM_Utils_Array::extend($defaults, self::getSystemDefaults($entity));
$this->cache->set($cacheKey, $defaults);
@@
-291,7
+291,7
@@
class SettingsManager {
if (is_array($civicrm_setting)) {
foreach ($civicrm_setting as $oldGroup => $values) {
if (is_array($civicrm_setting)) {
foreach ($civicrm_setting as $oldGroup => $values) {
- $newGroup =
isset($rewriteGroups[$oldGroup]) ? $rewriteGroups[$oldGroup] :
'domain';
+ $newGroup =
$rewriteGroups[$oldGroup] ??
'domain';
$result[$newGroup] = array_merge($result[$newGroup], $values);
}
}
$result[$newGroup] = array_merge($result[$newGroup], $values);
}
}