diff options
| author | Greg Roach <fisharebest@gmail.com> | 2021-04-29 22:10:00 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2021-04-29 22:16:04 +0100 |
| commit | 9d28ed8b1f54946e75dc56e8b0b0fd31dbd7070b (patch) | |
| tree | e81cf67dbfec943d57fdc27346634eef8d4e4449 /app/Http/RequestHandlers/MergeRecordsPage.php | |
| parent | 31daae996a95e67613a51086063ecc98a47dfa55 (diff) | |
| download | webtrees-9d28ed8b1f54946e75dc56e8b0b0fd31dbd7070b.tar.gz webtrees-9d28ed8b1f54946e75dc56e8b0b0fd31dbd7070b.tar.bz2 webtrees-9d28ed8b1f54946e75dc56e8b0b0fd31dbd7070b.zip | |
Fix: #3870 - merge _LOC records
Diffstat (limited to 'app/Http/RequestHandlers/MergeRecordsPage.php')
| -rw-r--r-- | app/Http/RequestHandlers/MergeRecordsPage.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/Http/RequestHandlers/MergeRecordsPage.php b/app/Http/RequestHandlers/MergeRecordsPage.php index a07eac97e8..ea73093757 100644 --- a/app/Http/RequestHandlers/MergeRecordsPage.php +++ b/app/Http/RequestHandlers/MergeRecordsPage.php @@ -23,6 +23,7 @@ use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Http\ViewResponseTrait; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\Location; use Fisharebest\Webtrees\Media; use Fisharebest\Webtrees\Note; use Fisharebest\Webtrees\Registry; @@ -81,6 +82,8 @@ class MergeRecordsPage implements RequestHandlerInterface 'note2' => $record2 instanceof Note ? $record2 : null, 'submitter1' => $record1 instanceof Submitter ? $record1 : null, 'submitter2' => $record2 instanceof Submitter ? $record2 : null, + 'location1' => $record1 instanceof Location ? $record1 : null, + 'location2' => $record2 instanceof Location ? $record2 : null, 'title' => $title, 'tree' => $tree, ]); |