Fix: config for new facts for fam/indi were not being used

1 files changed, 11 insertions, 4 deletions

diff --git a/app/Http/RequestHandlers/AddSpouseToFamilyPage.php b/app/Http/RequestHandlers/AddSpouseToFamilyPage.php
index 463be93992..c4c19205c1 100644
--- a/app/Http/RequestHandlers/AddSpouseToFamilyPage.php
+++ b/app/Http/RequestHandlers/AddSpouseToFamilyPage.php
@@ -79,22 +79,29 @@ class AddSpouseToFamilyPage implements RequestHandlerInterface
         $dummyi = Registry::individualFactory()->new('', '0 @@ INDI', null, $tree);
         $dummyf = Registry::familyFactory()->new('', '0 @@ FAM', null, $tree);
 
-        // Default names facts.
+        // Name facts.
         $surname_tradition = SurnameTradition::create($tree->getPreference('SURNAME_TRADITION'));
         $spouse            = $family->spouses()->first();
         assert($spouse instanceof Individual);
         $names      = $surname_tradition->newSpouseNames($spouse, $sex);
         $name_facts = array_map(static fn (string $gedcom): Fact => new Fact($gedcom, $dummyi, ''), $names);
 
+        // Individual facts and events.
+        $quick_facts = explode(',', $tree->getPreference('QUICK_REQUIRED_FACTS'));
+        $indi_facts  = array_map(static fn(string $fact): Fact => new Fact('1 ' . $fact, $dummyi, ''), $quick_facts);
+
+        // Family facts and events.
+        $quick_facts = explode(',', $tree->getPreference('QUICK_REQUIRED_FAMFACTS'));
+        $fam_facts   = array_map(static fn(string $fact): Fact => new Fact('1 ' . $fact, $dummyf, ''), $quick_facts);
+
         $facts = [
             'i' => [
                 new Fact('1 SEX ' . $sex, $dummyi, ''),
                 ...$name_facts,
-                new Fact('1 BIRT', $dummyi, ''),
-                new Fact('1 DEAT', $dummyi, ''),
+                ...$indi_facts,
             ],
             'f' => [
-                new Fact('1 MARR', $dummyf, ''),
+                ...$fam_facts,
             ],
         ];