3 files changed, 1 insertions, 55 deletions
diff --git a/app/Http/RequestHandlers/PasswordRequestPage.php b/app/Http/RequestHandlers/PasswordRequestPage.php
index a8593266ff..61d244cb02 100644
--- a/app/Http/RequestHandlers/PasswordRequestPage.php
+++ b/app/Http/RequestHandlers/PasswordRequestPage.php
@@ -54,6 +54,6 @@ class PasswordRequestPage implements RequestHandlerInterface
 
         $title = I18N::translate('Request a new password');
 
-        return $this->viewResponse('password-request-page', ['title' => $title, 'tree' => $tree instanceof Tree ? $tree->name() : null]);
+        return $this->viewResponse('password-request-page', ['title' => $title, 'tree' => $tree]);
     }
 }
diff --git a/app/Http/RequestHandlers/PrivacyPolicy.php b/app/Http/RequestHandlers/PrivacyPolicy.php
deleted file mode 100644
index 76ecdb663e..0000000000
--- a/app/Http/RequestHandlers/PrivacyPolicy.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * webtrees: online genealogy
- * Copyright (C) 2019 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
- * (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-declare(strict_types=1);
-
-namespace Fisharebest\Webtrees\Http\RequestHandlers;
-
-use Fisharebest\Webtrees\Http\ViewResponseTrait;
-use Fisharebest\Webtrees\I18N;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-/**
- * Show the privacy policy page.
- */
-class PrivacyPolicy implements RequestHandlerInterface
-{
-    use ViewResponseTrait;
-
-    /**
-     * @param ServerRequestInterface $request
-     *
-     * @return ResponseInterface
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        $tree  = $request->getAttribute('tree');
-        $title = I18N::translate('Privacy policy');
-
-        $uses_analytics = true;
-
-        return $this->viewResponse('privacy-policy', [
-            'title'          => $title,
-            'tree'           => $tree,
-            'uses_analytics' => $uses_analytics,
-        ]);
-    }
-}
diff --git a/app/Http/Routes/WebRoutes.php b/app/Http/Routes/WebRoutes.php
index 7520f7944b..c4187da0b9 100644
--- a/app/Http/Routes/WebRoutes.php
+++ b/app/Http/Routes/WebRoutes.php
@@ -487,7 +487,6 @@ class WebRoutes
         $router->get(RobotsTxt::class, '/robots.txt', RobotsTxt::class);
         $router->post(SelectTheme::class, '/theme/{theme}', SelectTheme::class);
         $router->get(VerifyEmail::class, '/verify', VerifyEmail::class);
-        $router->get(PrivacyPolicy::class, '/privacy-policy', PrivacyPolicy::class);
         $router->get(HomePage::class, '/', HomePage::class);
 
         // Legacy URLs from older software.