From 6c7ac2f65870ed4b4a809c454e157d518a766020 Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Fri, 12 Mar 2021 14:02:19 -0500 Subject: [PATCH] Revert the effects of both LP1687545 and LP1914116 Revert "LP1687545: Force TT CGI plugin to use ampersands in query strings" and "LP1914116: Apply html filter to mkurl() output" until a fix for LP1918470 is available. Signed-off-by: Jason Boyer --- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb/CGI_utf8.pm | 2 +- Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 | 6 +++--- Open-ILS/src/templates/opac/parts/header.tt2 | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb/CGI_utf8.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb/CGI_utf8.pm index 2e51936c00..0239e1b9d8 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb/CGI_utf8.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGWeb/CGI_utf8.pm @@ -13,7 +13,7 @@ package OpenILS::WWW::EGWeb::CGI_utf8; use strict; use warnings; use base 'Template::Plugin'; -use CGI qw(:all -utf8 -oldstyle_urls); +use CGI qw(:all -utf8); sub new { my $class = shift; diff --git a/Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 b/Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 index 88c39b14d6..f54b472241 100755 --- a/Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 +++ b/Open-ILS/src/templates-bootstrap/opac/parts/header.tt2 @@ -102,13 +102,13 @@ IF page; IF cgi.query_string; - page _ '?' _ cgi.query_string _ final | html; + page _ '?' _ cgi.query_string _ final; ELSE; - page _ final | html; + page _ final; END; ELSE; # staying on the current page - cgi.url("-absolute" => 1, "-path" => 1, "-query" => 1) _ final | html; + cgi.url("-absolute" => 1, "-path" => 1, "-query" => 1) _ final; END; END; diff --git a/Open-ILS/src/templates/opac/parts/header.tt2 b/Open-ILS/src/templates/opac/parts/header.tt2 index 0b404e073e..2bf7bb0e3c 100644 --- a/Open-ILS/src/templates/opac/parts/header.tt2 +++ b/Open-ILS/src/templates/opac/parts/header.tt2 @@ -102,13 +102,13 @@ IF page; IF cgi.query_string; - page _ '?' _ cgi.query_string _ final | html; + page _ '?' _ cgi.query_string _ final; ELSE; - page _ final | html; + page _ final; END; ELSE; # staying on the current page - cgi.url("-absolute" => 1, "-path" => 1, "-query" => 1) _ final | html; + cgi.url("-absolute" => 1, "-path" => 1, "-query" => 1) _ final; END; END; -- 2.11.0