Fix: undefined variable when linking media to record

5 files changed, 9 insertions, 14 deletions

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);
diff --git a/resources/views/modals/link-media-to-family.phtml b/resources/views/modals/link-media-to-family.phtml
index cc6a476d93..f887510998 100644
--- a/resources/views/modals/link-media-to-family.phtml
+++ b/resources/views/modals/link-media-to-family.phtml
@@ -1,9 +1,7 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 
-<form method="post" action="<?= e(route('link-media-to-record')) ?>" id="wt-modal-form">
+<form method="post" action="<?= e(route('link-media-to-record', ['tree' => $tree->name(), 'xref' => $media->xref()])) ?>" id="wt-modal-form">
     <?= csrf_field() ?>
-    <input type="hidden" name="tree" value="<?= e($tree->name()) ?>">
-    <input type="hidden" name="xref" value="<?= e($media->xref()) ?>">
 
     <?= view('modals/header', ['title' => I18N::translate('Link this media object to a family')]) ?>
 
diff --git a/resources/views/modals/link-media-to-individual.phtml b/resources/views/modals/link-media-to-individual.phtml
index 9fdf8f3883..2786ecf2ff 100644
--- a/resources/views/modals/link-media-to-individual.phtml
+++ b/resources/views/modals/link-media-to-individual.phtml
@@ -1,9 +1,7 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 
-<form method="post" action="<?= e(route('link-media-to-record')) ?>" id="wt-modal-form">
+<form method="post" action="<?= e(route('link-media-to-record', ['tree' => $tree->name(), 'xref' => $media->xref()])) ?>" id="wt-modal-form">
     <?= csrf_field() ?>
-    <input type="hidden" name="tree" value="<?= e($tree->name()) ?>">
-    <input type="hidden" name="xref" value="<?= e($media->xref()) ?>">
 
     <?= view('modals/header', ['title' => I18N::translate('Link this media object to an individual')]) ?>
 
diff --git a/resources/views/modals/link-media-to-source.phtml b/resources/views/modals/link-media-to-source.phtml
index 15234cb401..c80781b7a4 100644
--- a/resources/views/modals/link-media-to-source.phtml
+++ b/resources/views/modals/link-media-to-source.phtml
@@ -1,9 +1,7 @@
 <?php use Fisharebest\Webtrees\I18N; ?>
 
-<form method="post" action="<?= e(route('link-media-to-record')) ?>" id="wt-modal-form">
+<form method="post" action="<?= e(route('link-media-to-record', ['tree' => $tree->name(), 'xref' => $media->xref()])) ?>" id="wt-modal-form">
     <?= csrf_field() ?>
-    <input type="hidden" name="tree" value="<?= e($tree->name()) ?>">
-    <input type="hidden" name="xref" value="<?= e($media->xref()) ?>">
 
     <?= view('modals/header', ['title' => I18N::translate('Link this media object to a source')]) ?>