summaryrefslogtreecommitdiff
path: root/app/Http/RequestHandlers/MergeRecordsAction.php
diff options
context:
space:
mode:
authorGreg Roach <greg@subaqua.co.uk>2022-11-15 13:20:16 +0000
committerGreg Roach <greg@subaqua.co.uk>2022-11-18 11:55:56 +0000
commit748dbe155a6d19d66918ad136947fa23ee8f8469 (patch)
treeed4743592d3b0aea968f9cbae7e5d32c00b546fe /app/Http/RequestHandlers/MergeRecordsAction.php
parentf783aa1f4cd6d54a90d24a3d6be2996a3951fced (diff)
downloadwebtrees-748dbe155a6d19d66918ad136947fa23ee8f8469.tar.gz
webtrees-748dbe155a6d19d66918ad136947fa23ee8f8469.tar.bz2
webtrees-748dbe155a6d19d66918ad136947fa23ee8f8469.zip
Use Validator
Diffstat (limited to 'app/Http/RequestHandlers/MergeRecordsAction.php')
-rw-r--r--app/Http/RequestHandlers/MergeRecordsAction.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/Http/RequestHandlers/MergeRecordsAction.php b/app/Http/RequestHandlers/MergeRecordsAction.php
index 9fbf74d3e0..7fbb3d4c17 100644
--- a/app/Http/RequestHandlers/MergeRecordsAction.php
+++ b/app/Http/RequestHandlers/MergeRecordsAction.php
@@ -41,11 +41,8 @@ class MergeRecordsAction implements RequestHandlerInterface
public function handle(ServerRequestInterface $request): ResponseInterface
{
$tree = Validator::attributes($request)->tree();
-
- $params = (array) $request->getParsedBody();
-
- $xref1 = $params['xref1'] ?? '';
- $xref2 = $params['xref2'] ?? '';
+ $xref1 = Validator::parsedBody($request)->isXref()->string('xref1');
+ $xref2 = Validator::parsedBody($request)->isXref()->string('xref2');
// Merge record2 into record1
$record1 = Registry::gedcomRecordFactory()->make($xref1, $tree);