From d302967c3de812d5cabf38321a7da6c6325432fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michaela=20Br=C3=BCckner?= <brueckner@data-quest.de>
Date: Fri, 12 Jan 2024 09:55:59 +0000
Subject: [PATCH] fixes #3621
Closes #3621
Merge request studip/studip!2512
---
lib/navigation/LoginNavigation.php | 2 +-
templates/loginform.php | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/navigation/LoginNavigation.php b/lib/navigation/LoginNavigation.php
index bb63a03e97f..f5a1a3845ae 100644
--- a/lib/navigation/LoginNavigation.php
+++ b/lib/navigation/LoginNavigation.php
@@ -31,7 +31,7 @@ class LoginNavigation extends Navigation
$navigation->setLinkAttributes([
'id' => 'toggle-login'
]);
- $navigation->setURL('#login-form');
+ $navigation->setURL('#toggle-login');
$this->addSubNavigation('standard_login', $navigation);
$standard_login_active = true;
}
diff --git a/templates/loginform.php b/templates/loginform.php
index 66a87a71a07..a024298e74e 100644
--- a/templates/loginform.php
+++ b/templates/loginform.php
@@ -68,7 +68,7 @@ $show_hidden_login = false;
<? $name_and_title = explode(' - ', $nav->getTitle()) ?>
<li class="login_link">
<? if (is_internal_url($url = $nav->getURL())) : ?>
- <? SkipLinks::addLink($name_and_title[0], $url) ?>
+ <? SkipLinks::addLink($name_and_title[0], URLHelper::getLink($url, ['cancel_login' => 1])) ?>
<a href="<?= URLHelper::getLink($url, ['cancel_login' => 1]) ?>" <?= arrayToHtmlAttributes($nav->getLinkAttributes()) ?>>
<? else : ?>
<a href="<?= htmlReady($url) ?>" target="_blank" rel="noopener noreferrer">
@@ -83,7 +83,6 @@ $show_hidden_login = false;
<? endforeach ?>
</ul>
</nav>
-
<? if ($show_hidden_login) : ?>
<?= $this->render_partial('_standard_loginform', [
'hidden' => empty($loginerror),
--
GitLab