From ed31fb683f3c8e61d42f2379b98f23aa4ebdd063 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 6 May 2024 08:41:32 +0000
Subject: [PATCH] fixes #4115

Closes #4115

Merge request studip/studip!2959
---
 lib/navigation/FooterNavigation.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/navigation/FooterNavigation.php b/lib/navigation/FooterNavigation.php
index 32a41821f2f..4319c971ae0 100644
--- a/lib/navigation/FooterNavigation.php
+++ b/lib/navigation/FooterNavigation.php
@@ -69,13 +69,20 @@ class FooterNavigation extends Navigation
                 && User::findCurrent()
             )
         ) {
+            $url = Request::url();
+
+            // Remove 'page' parameter if the page links to itself
+            if (str_contains($url, 'dispatch.php/accessibility/forms/report_barrier')) {
+                $url = URLHelper::getURL($url, ['page' => null], true);
+            }
+
             $this->addSubNavigation(
                 'report_barrier',
                 new Navigation(
                     _('Barriere melden'),
                     URLHelper::getURL(
                         'dispatch.php/accessibility/forms/report_barrier',
-                        ['page' => Request::url(), 'cancel_login' => '1']
+                        ['page' => $url, 'cancel_login' => '1']
                     )
                 )
             );
-- 
GitLab