Merge pull request #262 from ufundo/core-frontend-group-values

Use frontend_title and frontend_description as group defaults
veda-consulting-company · Oct 22, 2021 · 03d314a · 03d314a
2 parents 96476a5 + d8456cb
commit 03d314a
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/CRM/Gdpr/Form/CommunicationsPreferences.php b/CRM/Gdpr/Form/CommunicationsPreferences.php
@@ -312,9 +312,7 @@ public function setDefaultValues() {
       // If value is missing in the setting, take the corresponding value from the
       // group.
       foreach($map as $setting_key => $group_key) {
-        if (empty($item[$setting_key]) && !empty($grp[$group_key])) {
-          $item[$setting_key] = $grp[$group_key];
-        }
+        $item[$setting_key] = $item[$setting_key] ?? $grp['frontend_' . $group_key] ?? $grp[$group_key];
       }
       // Set default weight.
       if (empty($item['group_weight'])) {