1 files changed, 24 insertions, 13 deletions

diff --git a/app/Http/RequestHandlers/ManageMediaData.php b/app/Http/RequestHandlers/ManageMediaData.php
index c48cf0b132..852db8510d 100644
--- a/app/Http/RequestHandlers/ManageMediaData.php
+++ b/app/Http/RequestHandlers/ManageMediaData.php
@@ -25,6 +25,7 @@ use Fisharebest\Webtrees\Media;
 use Fisharebest\Webtrees\Mime;
 use Fisharebest\Webtrees\Registry;
 use Fisharebest\Webtrees\Services\DatatablesService;
+use Fisharebest\Webtrees\Services\LinkedRecordService;
 use Fisharebest\Webtrees\Services\MediaFileService;
 use Fisharebest\Webtrees\Services\TreeService;
 use Illuminate\Database\Capsule\Manager as DB;
@@ -58,6 +59,8 @@ class ManageMediaData implements RequestHandlerInterface
 {
     private DatatablesService $datatables_service;
 
+    private LinkedRecordService $linked_record_service;
+
     private MediaFileService $media_file_service;
 
     private TreeService $tree_service;
@@ -65,18 +68,21 @@ class ManageMediaData implements RequestHandlerInterface
     /**
      * MediaController constructor.
      *
-     * @param DatatablesService $datatables_service
-     * @param MediaFileService  $media_file_service
-     * @param TreeService       $tree_service
+     * @param DatatablesService   $datatables_service
+     * @param LinkedRecordService $linked_record_service
+     * @param MediaFileService    $media_file_service
+     * @param TreeService         $tree_service
      */
     public function __construct(
         DatatablesService $datatables_service,
+        LinkedRecordService $linked_record_service,
         MediaFileService $media_file_service,
         TreeService $tree_service
     ) {
-        $this->datatables_service = $datatables_service;
-        $this->media_file_service = $media_file_service;
-        $this->tree_service       = $tree_service;
+        $this->datatables_service    = $datatables_service;
+        $this->linked_record_service = $linked_record_service;
+        $this->media_file_service    = $media_file_service;
+        $this->tree_service          = $tree_service;
     }
 
     /**
@@ -286,23 +292,28 @@ class ManageMediaData implements RequestHandlerInterface
         $html .= $element->value($media->getNote(), $media->tree());
 
         $linked = [];
-        foreach ($media->linkedIndividuals('OBJE') as $link) {
+
+        foreach ($this->linked_record_service->linkedIndividuals($media) as $link) {
             $linked[] = view('icons/individual') . '<a href="' . e($link->url()) . '">' . $link->fullName() . '</a>';
         }
-        foreach ($media->linkedFamilies('OBJE') as $link) {
+
+        foreach ($this->linked_record_service->linkedFamilies($media) as $link) {
             $linked[] = view('icons/family') . '<a href="' . e($link->url()) . '">' . $link->fullName() . '</a>';
         }
-        foreach ($media->linkedSources('OBJE') as $link) {
+
+        foreach ($this->linked_record_service->linkedSources($media) as $link) {
             $linked[] = view('icons/source') . '<a href="' . e($link->url()) . '">' . $link->fullName() . '</a>';
         }
-        foreach ($media->linkedNotes('OBJE') as $link) {
+
+        foreach ($this->linked_record_service->linkedNotes($media) as $link) {
             $linked[] = view('icons/note') . '<a href="' . e($link->url()) . '">' . $link->fullName() . '</a>';
         }
-        foreach ($media->linkedRepositories('OBJE') as $link) {
-            // Invalid GEDCOM - you cannot link a REPO to an OBJE
+
+        foreach ($this->linked_record_service->linkedRepositories($media) as $link) {
             $linked[] = view('icons/media') . '<a href="' . e($link->url()) . '">' . $link->fullName() . '</a>';
         }
-        foreach ($media->linkedLocations('OBJE') as $link) {
+
+        foreach ($this->linked_record_service->linkedMedia($media) as $link) {
             $linked[] = view('icons/location') . '<a href="' . e($link->url()) . '">' . $link->fullName() . '</a>';
         }