From 814c67071667246ee1742f45fbd7eed634f34cca Mon Sep 17 00:00:00 2001 From: Greg Roach Date: Thu, 14 Nov 2019 17:11:36 +0000 Subject: Fix: undefined variable when linking media to record --- app/Http/Controllers/EditMediaController.php | 9 +++++---- app/Http/Routes/WebRoutes.php | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'app/Http') diff --git a/app/Http/Controllers/EditMediaController.php b/app/Http/Controllers/EditMediaController.php index 48e11337c2..d8133d7936 100644 --- a/app/Http/Controllers/EditMediaController.php +++ b/app/Http/Controllers/EditMediaController.php @@ -38,6 +38,7 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use function assert; +use function is_string; /** * Controller for edit forms and responses. @@ -433,7 +434,6 @@ class EditMediaController extends AbstractEditController assert($tree instanceof Tree); $xref = $request->getQueryParams()['xref']; - $media = Media::getInstance($xref, $tree); return response(view('modals/link-media-to-individual', [ @@ -492,9 +492,10 @@ class EditMediaController extends AbstractEditController $tree = $request->getAttribute('tree'); assert($tree instanceof Tree); - $params = $request->getParsedBody(); - $xref = $params['xref']; - $link = $params['link']; + $xref = $request->getAttribute('xref'); + assert(is_string($xref)); + + $link = $request->getParsedBody()['link']; $media = Media::getInstance($xref, $tree); $record = GedcomRecord::getInstance($link, $tree); diff --git a/app/Http/Routes/WebRoutes.php b/app/Http/Routes/WebRoutes.php index d3908d4f02..2f27582f0b 100644 --- a/app/Http/Routes/WebRoutes.php +++ b/app/Http/Routes/WebRoutes.php @@ -375,7 +375,7 @@ class WebRoutes $router->get('link-media-to-individual', '/link-media-to-individual', 'EditMediaController::linkMediaToIndividual'); $router->get('link-media-to-family', '/link-media-to-family', 'EditMediaController::linkMediaToFamily'); $router->get('link-media-to-source', '/link-media-to-source', 'EditMediaController::linkMediaToSource'); - $router->post('link-media-to-record', '/link-media-to-record', 'EditMediaController::linkMediaToRecordAction'); + $router->post('link-media-to-record', '/link-media-to-record/{xref}', 'EditMediaController::linkMediaToRecordAction'); $router->post(PasteFact::class, '/paste-fact/{xref}', PasteFact::class); $router->get(ReorderChildrenPage::class, '/reorder-children/{xref}', ReorderChildrenPage::class); $router->post(ReorderChildrenAction::class, '/reorder-children/{xref}', ReorderChildrenAction::class); -- cgit v1.3