From 1ee3892529a0d920c555f357330316fdaff50e08 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 18 Apr 2013 15:07:40 -0300 Subject: [PATCH] Bug 10074 - Encoding problems at login time Bug 6554 patched output_html_with_http_headers to encode utf8 data, and Templates.pm to expect utf8 data to be encoded. (At least) the staff login screen outputs directly to STDOUT (Auth.pm does, WHICH IS WRONG!) and wasn't fixed to do the encoding first. This patch makes it use output_html_with_http_headers and solves the problem. Changed 'use' for 'require' as jcamins and marcelr suggested. Regards To+ Sponsored-by: Universidad Nacional de Cordoba Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Marcel de Rooy Signed-off-by: Jared Camins-Esakov (cherry picked from commit 5805b5f363bd657d3dac6aeba225438bf80cae9b) Signed-off-by: Jared Camins-Esakov --- C4/Auth.pm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index ca061b5284..811151b628 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -19,6 +19,7 @@ package C4::Auth; use strict; use warnings; + use Digest::MD5 qw(md5_base64); use Storable qw(thaw freeze); use URI::Escape; @@ -1065,14 +1066,10 @@ sub checkauth { LibraryName => C4::Context->preference("LibraryName"), ); $template->param( %info ); -# $cookie = $query->cookie(CGISESSID => $session->id -# ); - print $query->header( - -type => 'text/html', - -charset => 'utf-8', - -cookie => $cookie - ), - $template->output; + + require C4::Output; + C4::Output::output_html_with_http_headers( $query, $cookie, + $template->output); safe_exit; } -- 2.39.2