From 29e5e1d073f7b6c43c2db9d968a8c636dc6d0cc8 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Sun, 31 Dec 2017 09:46:36 +0000
Subject: [PATCH] Do not encode loginurl - it's a fully qualified URL so
encoding will break it.
---
modules/core/templates/frontpage_auth.twig | 2 +-
modules/core/templates/frontpage_config.twig | 2 +-
modules/core/templates/frontpage_federation.twig | 2 +-
modules/core/templates/frontpage_welcome.twig | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/core/templates/frontpage_auth.twig b/modules/core/templates/frontpage_auth.twig
index 5767915bb..d99d7be3b 100644
--- a/modules/core/templates/frontpage_auth.twig
+++ b/modules/core/templates/frontpage_auth.twig
@@ -6,7 +6,7 @@
<p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
{% else %}
<p class="float-r youareadmin">
- <a href="{{ loginurl|escape('url') }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
+ <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
</p>
{% endif %}
diff --git a/modules/core/templates/frontpage_config.twig b/modules/core/templates/frontpage_config.twig
index fc702d908..353f9b977 100644
--- a/modules/core/templates/frontpage_config.twig
+++ b/modules/core/templates/frontpage_config.twig
@@ -6,7 +6,7 @@
<p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
{% else %}
<p class="float-r youareadmin">
- <a href="{{ loginurl|escape('url') }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
+ <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
</p>
{% endif %}
diff --git a/modules/core/templates/frontpage_federation.twig b/modules/core/templates/frontpage_federation.twig
index 25601e42c..0b630c1e2 100644
--- a/modules/core/templates/frontpage_federation.twig
+++ b/modules/core/templates/frontpage_federation.twig
@@ -6,7 +6,7 @@
<p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
{% else %}
<p class="float-r youareadmin">
- <a href="{{ loginurl|escape('url') }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
+ <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
</p>
{% endif %}
diff --git a/modules/core/templates/frontpage_welcome.twig b/modules/core/templates/frontpage_welcome.twig
index 3ed8da3ea..c4c305222 100644
--- a/modules/core/templates/frontpage_welcome.twig
+++ b/modules/core/templates/frontpage_welcome.twig
@@ -6,7 +6,7 @@
<p class="float-r youareadmin">{{ '{core:frontpage:loggedin_as_admin}'|trans }}</p>
{% else %}
<p class="float-r youareadmin">
- <a href="{{ loginurl|escape('url') }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
+ <a href="{{ loginurl }}">{{ '{core:frontpage:login_as_admin}'|trans }}</a>
</p>
{% endif %}
--
GitLab