3 files changed, 4 insertions, 7 deletions
diff --git a/app/Http/RequestHandlers/BroadcastPage.php b/app/Http/RequestHandlers/BroadcastPage.php
index b627fef34b..ce4cd349fa 100644
--- a/app/Http/RequestHandlers/BroadcastPage.php
+++ b/app/Http/RequestHandlers/BroadcastPage.php
@@ -54,12 +54,10 @@ class BroadcastPage implements RequestHandlerInterface
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
         $user    = $request->getAttribute('user');
-        $referer = $request->getHeaderLine('referer');
         $params  = $request->getQueryParams();
         $body    = $params['body'] ?? '';
         $subject = $params['subject'] ?? '';
         $to      = $params['to'];
-        $url     = $params['url'] ?? $referer;
 
         $to_names = $this->message_service->recipientUsers($to)
             ->map(static function (UserInterface $user): string {
@@ -77,7 +75,6 @@ class BroadcastPage implements RequestHandlerInterface
             'title'    => $title,
             'to'       => $to,
             'to_names' => $to_names,
-            'url'      => $url,
         ]);
     }
 }
diff --git a/app/Http/RequestHandlers/ContactPage.php b/app/Http/RequestHandlers/ContactPage.php
index 5b32968a77..9f9ab79222 100644
--- a/app/Http/RequestHandlers/ContactPage.php
+++ b/app/Http/RequestHandlers/ContactPage.php
@@ -31,6 +31,7 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 use function assert;
 use function in_array;
+use function route;
 
 /**
  * Compose a message from a visitor.
@@ -67,14 +68,13 @@ class ContactPage implements RequestHandlerInterface
         $tree = $request->getAttribute('tree');
         assert($tree instanceof Tree);
 
-        $referer    = $request->getHeaderLine('referer');
         $params     = $request->getQueryParams();
         $body       = $params['body'] ?? '';
         $from_email = $params['from_email'] ?? '';
         $from_name  = $params['from_name'] ?? '';
         $subject    = $params['subject'] ?? '';
         $to         = $params['to'] ?? '';
-        $url        = $params['url'] ?? $referer;
+        $url        = $params['url'] ?? route(HomePage::class);
 
         $to_user = $this->user_service->findByUserName($to);
 
diff --git a/app/Http/RequestHandlers/MessagePage.php b/app/Http/RequestHandlers/MessagePage.php
index a74260754b..8d5bc1883f 100644
--- a/app/Http/RequestHandlers/MessagePage.php
+++ b/app/Http/RequestHandlers/MessagePage.php
@@ -30,6 +30,7 @@ use Psr\Http\Server\RequestHandlerInterface;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 
 use function assert;
+use function route;
 
 /**
  * Compose a message from a logged-in user.
@@ -62,11 +63,10 @@ class MessagePage implements RequestHandlerInterface
         assert($tree instanceof Tree);
 
         $user    = $request->getAttribute('user');
-        $referer = $request->getHeaderLine('referer');
         $body    = $request->getQueryParams()['body'] ?? '';
         $subject = $request->getQueryParams()['subject'] ?? '';
         $to      = $request->getQueryParams()['to'] ?? '';
-        $url     = $request->getQueryParams()['url'] ?? $referer;
+        $url     = $request->getQueryParams()['url'] ?? route(HomePage::class);
         $to_user = $this->user_service->findByUserName($to);
 
         if ($to_user === null || $to_user->getPreference(User::PREF_CONTACT_METHOD) === 'none') {