From f040ac502497a0de299b8898d25715078f1923b1 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Fri, 24 Jun 2022 12:02:14 +0000
Subject: [PATCH] Remove more duplicate and misplaced encoding
---
src/SimpleSAML/XHTML/IdPDisco.php | 3 +--
src/SimpleSAML/XHTML/Template.php | 5 ++---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/SimpleSAML/XHTML/IdPDisco.php b/src/SimpleSAML/XHTML/IdPDisco.php
index d141f48d2..818daad96 100644
--- a/src/SimpleSAML/XHTML/IdPDisco.php
+++ b/src/SimpleSAML/XHTML/IdPDisco.php
@@ -18,7 +18,6 @@ use function array_intersect;
use function array_key_exists;
use function array_keys;
use function array_merge;
-use function htmlspecialchars;
use function preg_match;
use function sizeof;
use function strcasecmp;
@@ -631,7 +630,7 @@ class IdPDisco
$t->data['return'] = $this->returnURL;
$t->data['returnIDParam'] = $this->returnIdParam;
$t->data['entityID'] = $this->spEntityId;
- $t->data['urlpattern'] = htmlspecialchars($httpUtils->getSelfURLNoQuery());
+ $t->data['urlpattern'] = $httpUtils->getSelfURLNoQuery();
$t->data['rememberenabled'] = $this->config->getOptionalBoolean('idpdisco.enableremember', false);
$t->data['rememberchecked'] = $this->config->getOptionalBoolean('idpdisco.rememberchecked', false);
$t->send();
diff --git a/src/SimpleSAML/XHTML/Template.php b/src/SimpleSAML/XHTML/Template.php
index 5cfb6c86b..149ccb0c4 100644
--- a/src/SimpleSAML/XHTML/Template.php
+++ b/src/SimpleSAML/XHTML/Template.php
@@ -39,7 +39,6 @@ use function count;
use function date;
use function explode;
use function hash;
-use function htmlspecialchars;
use function in_array;
use function is_null;
use function key;
@@ -476,10 +475,10 @@ class Template extends Response
$url = false;
if (!$current) {
$httpUtils = new Utils\HTTP();
- $url = htmlspecialchars($httpUtils->addURLParameters(
+ $url = $httpUtils->addURLParameters(
'',
[$parameterName => $lang]
- ));
+ );
}
$langmap[$lang] = [
'name' => $langname,
--
GitLab