Handle non-latin1 charsets

diff --git a/admin/branches.pl b/admin/branches.pl
index 0e7c14d..7094bf7 100755 (executable)
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -26,6 +26,7 @@ use CGI;
 use C4::Auth;
 use C4::Context;
 use C4::Output;
+use C4::Charset;
 use HTML::Template;
 
 # Fixed variables
@@ -376,4 +377,7 @@ sub checkdatabasefor {
     return $message;
 }
 
-print $input->header(-cookie => $cookie), $template->output;
+print $input->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+), $template->output;

diff --git a/reports-home.pl b/reports-home.pl
index 602df13..4a86630 100755 (executable)
--- a/reports-home.pl
+++ b/reports-home.pl
@@ -4,6 +4,7 @@ use strict;
 use CGI;
 use C4::Auth;
 use C4::Output;
+use C4::Charset;
 use C4::Context;
 use HTML::Template;
 
@@ -16,4 +17,7 @@ my ($template, $loggedinuser, $cookie)
                                flagsrequired => {permissions => 1},
                                debug => 1,
                                });
-print $query->header(-cookie => $cookie),$template->output;
+print $query->header(
+    -type => guesstype($template->output),
+    -cookie => $cookie
+),$template->output;