New module to redirect legacy URLs

1 files changed, 7 insertions, 5 deletions

diff --git a/app/Http/RequestHandlers/RedirectNotePhp.php b/app/Http/RequestHandlers/RedirectNotePhp.php
index 0a1d1cb859..7faa3309bf 100644
--- a/app/Http/RequestHandlers/RedirectNotePhp.php
+++ b/app/Http/RequestHandlers/RedirectNotePhp.php
@@ -2,7 +2,7 @@
 
 /**
  * webtrees: online genealogy
- * Copyright (C) 2019 webtrees development team
+ * Copyright (C) 2020 webtrees development team
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -23,6 +23,7 @@ use Fig\Http\Message\StatusCodeInterface;
 use Fisharebest\Webtrees\Exceptions\NoteNotFoundException;
 use Fisharebest\Webtrees\Note;
 use Fisharebest\Webtrees\Services\TreeService;
+use Fisharebest\Webtrees\Site;
 use Fisharebest\Webtrees\Tree;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -53,12 +54,13 @@ class RedirectNotePhp implements RequestHandlerInterface
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $ged  = $request->getQueryParams()['ged'] ?? null;
-        $tree = $this->tree_service->all()->get($ged);
+        $query = $request->getQueryParams();
+        $ged   = $query['ged'] ?? Site::getPreference('DEFAULT_GEDCOM');
+        $nid   = $query['nid'] ?? '';
+        $tree  = $this->tree_service->all()->get($ged);
 
         if ($tree instanceof Tree) {
-            $xref = $request->getQueryParams()['nid'] ?? '';
-            $note = Note::getInstance($xref, $tree);
+            $note = Note::getInstance($nid, $tree);
 
             if ($note instanceof Note) {
                 return redirect($note->url(), StatusCodeInterface::STATUS_MOVED_PERMANENTLY);