summaryrefslogtreecommitdiff
path: root/app/Http/RequestHandlers/MergeRecordsPage.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-12-09 20:20:57 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-12-10 12:00:29 +0000
commit70fa890628e03c8b96086827335f0e40a8780fc5 (patch)
tree8619c8e7223819cf1f6fd9971be6e8db40d0e5f4 /app/Http/RequestHandlers/MergeRecordsPage.php
parentffc0a61f636c2f449ee87acaba2c9b803ca6e758 (diff)
downloadwebtrees-70fa890628e03c8b96086827335f0e40a8780fc5.tar.gz
webtrees-70fa890628e03c8b96086827335f0e40a8780fc5.tar.bz2
webtrees-70fa890628e03c8b96086827335f0e40a8780fc5.zip
Ability to merge submitter records #2823
Diffstat (limited to 'app/Http/RequestHandlers/MergeRecordsPage.php')
-rw-r--r--app/Http/RequestHandlers/MergeRecordsPage.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/app/Http/RequestHandlers/MergeRecordsPage.php b/app/Http/RequestHandlers/MergeRecordsPage.php
index 5eceb7a305..f53673b3ca 100644
--- a/app/Http/RequestHandlers/MergeRecordsPage.php
+++ b/app/Http/RequestHandlers/MergeRecordsPage.php
@@ -28,6 +28,7 @@ use Fisharebest\Webtrees\Media;
use Fisharebest\Webtrees\Note;
use Fisharebest\Webtrees\Repository;
use Fisharebest\Webtrees\Source;
+use Fisharebest\Webtrees\Submitter;
use Fisharebest\Webtrees\Tree;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
@@ -78,6 +79,8 @@ class MergeRecordsPage implements RequestHandlerInterface
'media2' => $record2 instanceof Media ? $record2 : null,
'note1' => $record1 instanceof Note ? $record1 : null,
'note2' => $record2 instanceof Note ? $record2 : null,
+ 'submitter1' => $record1 instanceof Submitter ? $record1 : null,
+ 'submitter2' => $record2 instanceof Submitter ? $record2 : null,
'title' => $title,
'tree' => $tree,
]);