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 <JBoyer@EquinoxInitiative.org>

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 2e51936..0239e1b 100644 (file)
--- 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 88c39b1..f54b472 100755 (executable)
--- 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 0b404e0..2bf7bb0 100644 (file)
--- 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;