Fix: #2000 - xref parameter missing from report menus

18 files changed, 109 insertions, 99 deletions

diff --git a/app/Module/AhnentafelReportModule.php b/app/Module/AhnentafelReportModule.php
index 09a4b11e40..88942bbfab 100644
--- a/app/Module/AhnentafelReportModule.php
+++ b/app/Module/AhnentafelReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class AhnentafelReportModule
@@ -66,16 +66,18 @@ class AhnentafelReportModule extends AbstractModule implements ModuleReportInter
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'xref'   => $individual->xref(),
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/BirthDeathMarriageReportModule.php b/app/Module/BirthDeathMarriageReportModule.php
index 92fe4ae825..5d3a2bfbbc 100644
--- a/app/Module/BirthDeathMarriageReportModule.php
+++ b/app/Module/BirthDeathMarriageReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class BirthDeathMarriageReportModule
@@ -53,7 +53,6 @@ class BirthDeathMarriageReportModule extends AbstractModule implements ModuleRep
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -66,16 +65,17 @@ class BirthDeathMarriageReportModule extends AbstractModule implements ModuleRep
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/BirthReportModule.php b/app/Module/BirthReportModule.php
index 79bd993b00..4909b1572e 100644
--- a/app/Module/BirthReportModule.php
+++ b/app/Module/BirthReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class BirthReportModule
@@ -45,7 +45,6 @@ class BirthReportModule extends AbstractModule implements ModuleReportInterface
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,17 @@ class BirthReportModule extends AbstractModule implements ModuleReportInterface
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/CemeteryReportModule.php b/app/Module/CemeteryReportModule.php
index 8896e7c89e..2ca382d842 100644
--- a/app/Module/CemeteryReportModule.php
+++ b/app/Module/CemeteryReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class CemeteryReportModule
@@ -45,7 +45,6 @@ class CemeteryReportModule extends AbstractModule implements ModuleReportInterfa
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,17 @@ class CemeteryReportModule extends AbstractModule implements ModuleReportInterfa
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/ChangeReportModule.php b/app/Module/ChangeReportModule.php
index ed5de3fd48..857a0b2023 100644
--- a/app/Module/ChangeReportModule.php
+++ b/app/Module/ChangeReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class ChangeReportModule
@@ -45,7 +45,6 @@ class ChangeReportModule extends AbstractModule implements ModuleReportInterface
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,17 @@ class ChangeReportModule extends AbstractModule implements ModuleReportInterface
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/DeathReportModule.php b/app/Module/DeathReportModule.php
index 0085c8b884..c6f355db72 100644
--- a/app/Module/DeathReportModule.php
+++ b/app/Module/DeathReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class DeathReportModule
@@ -45,7 +45,6 @@ class DeathReportModule extends AbstractModule implements ModuleReportInterface
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,17 @@ class DeathReportModule extends AbstractModule implements ModuleReportInterface
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/DescendancyReportModule.php b/app/Module/DescendancyReportModule.php
index 6358bb1774..72009d91eb 100644
--- a/app/Module/DescendancyReportModule.php
+++ b/app/Module/DescendancyReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class DescendancyReportModule
@@ -45,7 +45,6 @@ class DescendancyReportModule extends AbstractModule implements ModuleReportInte
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,18 @@ class DescendancyReportModule extends AbstractModule implements ModuleReportInte
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'xref'   => $individual->xref(),
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/FactSourcesReportModule.php b/app/Module/FactSourcesReportModule.php
index d0fff28c94..58e73c536d 100644
--- a/app/Module/FactSourcesReportModule.php
+++ b/app/Module/FactSourcesReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class FactSourcesReportModule
@@ -45,7 +45,6 @@ class FactSourcesReportModule extends AbstractModule implements ModuleReportInte
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,17 @@ class FactSourcesReportModule extends AbstractModule implements ModuleReportInte
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/FamilyGroupReportModule.php b/app/Module/FamilyGroupReportModule.php
index 01e3f41bbe..770b54c069 100644
--- a/app/Module/FamilyGroupReportModule.php
+++ b/app/Module/FamilyGroupReportModule.php
@@ -19,6 +19,7 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
 use Fisharebest\Webtrees\Tree;
 
@@ -45,7 +46,6 @@ class FamilyGroupReportModule extends AbstractModule implements ModuleReportInte
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -62,12 +62,13 @@ class FamilyGroupReportModule extends AbstractModule implements ModuleReportInte
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/IndividualFamiliesReportModule.php b/app/Module/IndividualFamiliesReportModule.php
index c13f662999..22d5120f47 100644
--- a/app/Module/IndividualFamiliesReportModule.php
+++ b/app/Module/IndividualFamiliesReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class IndividualFamiliesReportModule
@@ -45,7 +45,6 @@ class IndividualFamiliesReportModule extends AbstractModule implements ModuleRep
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,17 @@ class IndividualFamiliesReportModule extends AbstractModule implements ModuleRep
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/IndividualReportModule.php b/app/Module/IndividualReportModule.php
index f19bf37065..d91fbee000 100644
--- a/app/Module/IndividualReportModule.php
+++ b/app/Module/IndividualReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class IndividualReportModule
@@ -45,7 +45,6 @@ class IndividualReportModule extends AbstractModule implements ModuleReportInter
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,18 @@ class IndividualReportModule extends AbstractModule implements ModuleReportInter
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'xref'   => $individual->xref(),
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/MarriageReportModule.php b/app/Module/MarriageReportModule.php
index b30ded4c5f..b3c997b9e6 100644
--- a/app/Module/MarriageReportModule.php
+++ b/app/Module/MarriageReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class MarriageReportModule
@@ -45,7 +45,6 @@ class MarriageReportModule extends AbstractModule implements ModuleReportInterfa
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,17 @@ class MarriageReportModule extends AbstractModule implements ModuleReportInterfa
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/MissingFactsReportModule.php b/app/Module/MissingFactsReportModule.php
index 539894c7c8..b4134cf8be 100644
--- a/app/Module/MissingFactsReportModule.php
+++ b/app/Module/MissingFactsReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class MissingFactsReportModule
@@ -45,7 +45,6 @@ class MissingFactsReportModule extends AbstractModule implements ModuleReportInt
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,18 @@ class MissingFactsReportModule extends AbstractModule implements ModuleReportInt
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'xref'   => $individual->xref(),
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/ModuleReportInterface.php b/app/Module/ModuleReportInterface.php
index 20c40fe3b3..11ff24a207 100644
--- a/app/Module/ModuleReportInterface.php
+++ b/app/Module/ModuleReportInterface.php
@@ -17,8 +17,8 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Module;
 
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Interface ModuleReportInterface - Classes and libraries for module system
@@ -28,9 +28,9 @@ interface ModuleReportInterface extends ModuleInterface
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu;
+    public function getReportMenu(Individual $individual): Menu;
 }
diff --git a/app/Module/OccupationReportModule.php b/app/Module/OccupationReportModule.php
index 98f058e18f..221b8383c2 100644
--- a/app/Module/OccupationReportModule.php
+++ b/app/Module/OccupationReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class OccupationReportModule
@@ -45,7 +45,6 @@ class OccupationReportModule extends AbstractModule implements ModuleReportInter
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,17 @@ class OccupationReportModule extends AbstractModule implements ModuleReportInter
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/PedigreeReportModule.php b/app/Module/PedigreeReportModule.php
index b0dad20ac9..23b8c0fef5 100644
--- a/app/Module/PedigreeReportModule.php
+++ b/app/Module/PedigreeReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class PedigreeReportModule
@@ -45,7 +45,6 @@ class PedigreeReportModule extends AbstractModule implements ModuleReportInterfa
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,18 @@ class PedigreeReportModule extends AbstractModule implements ModuleReportInterfa
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'xref'   => $individual->xref(),
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Module/RelatedIndividualsReportModule.php b/app/Module/RelatedIndividualsReportModule.php
index 4d5ab0b47a..81f563c283 100644
--- a/app/Module/RelatedIndividualsReportModule.php
+++ b/app/Module/RelatedIndividualsReportModule.php
@@ -19,8 +19,8 @@ namespace Fisharebest\Webtrees\Module;
 
 use Fisharebest\Webtrees\Auth;
 use Fisharebest\Webtrees\I18N;
+use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\Menu;
-use Fisharebest\Webtrees\Tree;
 
 /**
  * Class RelatedIndividualsReportModule
@@ -45,7 +45,6 @@ class RelatedIndividualsReportModule extends AbstractModule implements ModuleRep
 
     /**
      * What is the default access level for this module?
-     *
      * Some modules are aimed at admins or managers, and are not generally shown to users.
      *
      * @return int
@@ -58,16 +57,18 @@ class RelatedIndividualsReportModule extends AbstractModule implements ModuleRep
     /**
      * Return a menu item for this report.
      *
-     * @param Tree $tree
+     * @param Individual $individual
      *
      * @return Menu
      */
-    public function getReportMenu(Tree $tree): Menu
+    public function getReportMenu(Individual $individual): Menu
     {
         return new Menu(
             $this->getTitle(),
-            route('report-setup', ['ged'    => $tree->name(),
-                                   'report' => $this->getName(),
+            route('report-setup', [
+                'xref'   => $individual->xref(),
+                'ged'    => $individual->tree()->name(),
+                'report' => $this->getName(),
             ]),
             'menu-report-' . $this->getName(),
             ['rel' => 'nofollow']
diff --git a/app/Theme/AbstractTheme.php b/app/Theme/AbstractTheme.php
index 62ab431cb9..1da1604916 100644
--- a/app/Theme/AbstractTheme.php
+++ b/app/Theme/AbstractTheme.php
@@ -1530,13 +1530,15 @@ abstract class AbstractTheme
     /**
      * A menu with a list of reports.
      *
+     * @param Individual $individual
+     *
      * @return Menu|null
      */
-    public function menuReports()
+    public function menuReports(Individual $individual)
     {
         $submenus = [];
         foreach (Module::getActiveReports($this->tree) as $report) {
-            $submenus[] = $report->getReportMenu($this->tree);
+            $submenus[] = $report->getReportMenu($individual);
         }
 
         if (empty($submenus)) {
@@ -1811,7 +1813,7 @@ abstract class AbstractTheme
             $this->menuChart($individual),
             $this->menuLists($surname),
             $this->menuCalendar(),
-            $this->menuReports(),
+            $this->menuReports($individual),
             $this->menuSearch(),
         ], $this->menuModules()));
     }