From: Frédéric Demians <f.demians@tamil.fr>
Date: Mon, 31 Jan 2011 20:12:32 +0000 (+0100)
Subject: For catalyst/template_test branch. There are still issues with displaying biblios.
X-Git-Tag: v3.04.00~203
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=51f067fcb23ae2c84ead4acfd3b65e825b976e1a;p=koha-ffzg.git

For catalyst/template_test branch. There are still issues with displaying biblios.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---

diff --git a/C4/Output.pm b/C4/Output.pm
index d6e9fec0a2..abd8fc3639 100644
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -472,6 +472,8 @@ sub output_with_http_headers($$$$;$) {
     # remove SUDOC specific NSB NSE
     $data =~ s/\x{C2}\x{98}|\x{C2}\x{9C}/ /g;
     $data =~ s/\x{C2}\x{88}|\x{C2}\x{89}/ /g;
+    utf8::encode($data) if utf8::is_utf8($data);
+
     print $query->header($options), $data;
 }
 
diff --git a/C4/Templates.pm b/C4/Templates.pm
index 9a07d95232..a5981490a4 100644
--- a/C4/Templates.pm
+++ b/C4/Templates.pm
@@ -108,7 +108,6 @@ sub param{
     while(@_){
 	my $key = shift;
 	my $val = shift;
-        utf8::encode($val) if utf8::is_utf8($val);
 	$self->{VARS}->{$key} = $val;
     }
 }