Fix: #4497 - only delete one-person family records when there are no …

…facts
fisharebest · Jul 7, 2022 · 588fd84 · 588fd84
1 parent d40f78e
commit 588fd84
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/Http/RequestHandlers/DeleteRecord.php b/app/Http/RequestHandlers/DeleteRecord.php
@@ -73,8 +73,12 @@ public function handle(ServerRequestInterface $request): ResponseInterface
                 $old_gedcom = $linker->gedcom();
                 $new_gedcom = $this->removeLinks($old_gedcom, $record->xref());
                 if ($old_gedcom !== $new_gedcom) {
-                    // If we have removed a link from a family to an individual, and it now has only one member
-                    if ($linker instanceof Family && preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . Gedcom::REGEX_XREF . ')@/', $new_gedcom, $match) === 1) {
+                    // If we have removed a link from a family to an individual, and it now has only one member and no genealogy facts
+                    if (
+                        $linker instanceof Family &&
+                        preg_match('/\n1 (ANUL|CENS|DIV|DIVF|ENGA|MAR[BCLRS]|RESI|EVEN)/', $new_gedcom, $match) !== 1 &&
+                        preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . Gedcom::REGEX_XREF . ')@/', $new_gedcom, $match) === 1
+                    ) {
                         // Delete the family
                         /* I18N: %s is the name of a family group, e.g. “Husband name + Wife name” */
                         FlashMessages::addMessage(I18N::translate('The family “%s” has been deleted because it only has one member.', $linker->fullName()));