diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2020-05-12 00:38:22 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2020-05-12 14:19:35 +0100 |
| commit | a091ac74647eab281b25090b737835eeea14ae10 (patch) | |
| tree | 5e968be23c54e70f67812b1cca78c7e1e17aa95d /app/Http/RequestHandlers/MergeRecordsAction.php | |
| parent | bb03c9f048b83092098d5e46c2ab323ae7e2b314 (diff) | |
| download | webtrees-a091ac74647eab281b25090b737835eeea14ae10.tar.gz webtrees-a091ac74647eab281b25090b737835eeea14ae10.tar.bz2 webtrees-a091ac74647eab281b25090b737835eeea14ae10.zip | |
Update code to use new Factory objects
Diffstat (limited to 'app/Http/RequestHandlers/MergeRecordsAction.php')
| -rw-r--r-- | app/Http/RequestHandlers/MergeRecordsAction.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/Http/RequestHandlers/MergeRecordsAction.php b/app/Http/RequestHandlers/MergeRecordsAction.php index f06ab0a8a9..10ac6283fd 100644 --- a/app/Http/RequestHandlers/MergeRecordsAction.php +++ b/app/Http/RequestHandlers/MergeRecordsAction.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,7 +19,7 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\RequestHandlers; -use Fisharebest\Webtrees\GedcomRecord; +use Fisharebest\Webtrees\Factory; use Fisharebest\Webtrees\Tree; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -50,8 +50,8 @@ class MergeRecordsAction implements RequestHandlerInterface $xref2 = $params['xref2'] ?? ''; // Merge record2 into record1 - $record1 = GedcomRecord::getInstance($xref1, $tree); - $record2 = GedcomRecord::getInstance($xref2, $tree); + $record1 = Factory::gedcomRecord()->make($xref1, $tree); + $record2 = Factory::gedcomRecord()->make($xref2, $tree); if ( $record1 === null || |