From: Tomas Cohen Arazi <tomascohen@gmail.com>
Date: Thu, 18 Apr 2013 19:27:03 +0000 (-0300)
Subject: Bug 10074 - Encoding problems for installer
X-Git-Tag: v3.14.00-alpha1~889^2~1
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=d0c6e09429d2af711f911b57601a02f17591d441;p=koha-ffzg.git

Bug 10074 - Encoding problems for installer

Bug 6554 patched output_html_with_http_headers to encode utf8 data, and Templates.pm to expect utf8 data to be encoded.
The Installer page login screen outputs directly to STDOUT (InstallAuthAuth.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.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---

diff --git a/installer/InstallAuth.pm b/installer/InstallAuth.pm
index 0015a14e2d..a86681565d 100644
--- a/installer/InstallAuth.pm
+++ b/installer/InstallAuth.pm
@@ -394,11 +394,8 @@ sub checkauth {
         -HttpOnly => 1,
         -expires => ''
     );
-    print $query->header(
-        -type    => 'text/html; charset=utf-8',
-        -cookie  => $cookie
-      ),
-      $template->output;
+
+    output_html_with_http_headers $query, $cookie, $template->output;
     exit;
 }