summaryrefslogtreecommitdiff
path: root/app/Http/RequestHandlers/MergeRecordsPage.php
diff options
context:
space:
mode:
authorGreg Roach <greg@subaqua.co.uk>2020-05-12 00:38:22 +0100
committerGreg Roach <greg@subaqua.co.uk>2020-05-12 14:19:35 +0100
commita091ac74647eab281b25090b737835eeea14ae10 (patch)
tree5e968be23c54e70f67812b1cca78c7e1e17aa95d /app/Http/RequestHandlers/MergeRecordsPage.php
parentbb03c9f048b83092098d5e46c2ab323ae7e2b314 (diff)
downloadwebtrees-a091ac74647eab281b25090b737835eeea14ae10.tar.gz
webtrees-a091ac74647eab281b25090b737835eeea14ae10.tar.bz2
webtrees-a091ac74647eab281b25090b737835eeea14ae10.zip
Update code to use new Factory objects
Diffstat (limited to 'app/Http/RequestHandlers/MergeRecordsPage.php')
-rw-r--r--app/Http/RequestHandlers/MergeRecordsPage.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/Http/RequestHandlers/MergeRecordsPage.php b/app/Http/RequestHandlers/MergeRecordsPage.php
index 5c3e7f42fd..38d7855a84 100644
--- a/app/Http/RequestHandlers/MergeRecordsPage.php
+++ b/app/Http/RequestHandlers/MergeRecordsPage.php
@@ -2,7 +2,7 @@
/**
* webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
+ * Copyright (C) 2020 webtrees development team
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
@@ -19,8 +19,8 @@ declare(strict_types=1);
namespace Fisharebest\Webtrees\Http\RequestHandlers;
+use Fisharebest\Webtrees\Factory;
use Fisharebest\Webtrees\Family;
-use Fisharebest\Webtrees\GedcomRecord;
use Fisharebest\Webtrees\Http\ViewResponseTrait;
use Fisharebest\Webtrees\I18N;
use Fisharebest\Webtrees\Individual;
@@ -61,8 +61,8 @@ class MergeRecordsPage implements RequestHandlerInterface
$xref1 = $request->getQueryParams()['xref1'] ?? '';
$xref2 = $request->getQueryParams()['xref2'] ?? '';
- $record1 = GedcomRecord::getInstance($xref1, $tree);
- $record2 = GedcomRecord::getInstance($xref2, $tree);
+ $record1 = Factory::gedcomRecord()->make($xref1, $tree);
+ $record2 = Factory::gedcomRecord()->make($xref2, $tree);
$title = I18N::translate('Merge records') . ' — ' . e($tree->title());