diff options
| author | Greg Roach <fisharebest@webtrees.net> | 2019-11-03 17:48:01 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@webtrees.net> | 2019-11-03 17:48:01 +0000 |
| commit | 143a1139a6fa38e0157bfc925cb583505201e481 (patch) | |
| tree | e11b18943e59a3807f08f597bc2a69b11558a366 /app/Http/RequestHandlers/DeleteRecord.php | |
| parent | 7c283925f04fe85d812a27edeca96199fcd0ae91 (diff) | |
| download | webtrees-143a1139a6fa38e0157bfc925cb583505201e481.tar.gz webtrees-143a1139a6fa38e0157bfc925cb583505201e481.tar.bz2 webtrees-143a1139a6fa38e0157bfc925cb583505201e481.zip | |
Fix: #2623 - auto-delete families with one member is not working
Diffstat (limited to 'app/Http/RequestHandlers/DeleteRecord.php')
| -rw-r--r-- | app/Http/RequestHandlers/DeleteRecord.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Http/RequestHandlers/DeleteRecord.php b/app/Http/RequestHandlers/DeleteRecord.php index a3adff4a47..0cd339bae5 100644 --- a/app/Http/RequestHandlers/DeleteRecord.php +++ b/app/Http/RequestHandlers/DeleteRecord.php @@ -66,9 +66,9 @@ class DeleteRecord implements RequestHandlerInterface $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 has only one member - if (preg_match('/^0 @' . Gedcom::REGEX_XREF . '@ FAM/', $new_gedcom) && preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . Gedcom::REGEX_XREF . ')@/', $new_gedcom, $match) == 1) { + if (preg_match('/^0 @(' . Gedcom::REGEX_XREF . ')@ FAM/', $new_gedcom, $fmatch) && preg_match_all('/\n1 (HUSB|WIFE|CHIL) @(' . Gedcom::REGEX_XREF . ')@/', $new_gedcom, $match) === 1) { // Delete the family - $family = GedcomRecord::getInstance($xref, $tree); + $family = GedcomRecord::getInstance($fmatch[1], $tree); /* 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.', $family->fullName())); $family->deleteRecord(); |