From 5fb9da1ca23cd6e6335e64dbc5adfb016759b011 Mon Sep 17 00:00:00 2001 From: Ketan Kulkarni Date: Sun, 22 Sep 2013 23:42:28 +0530 Subject: [PATCH] double decoding problem - bug # 6554 --- C4/Templates.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/C4/Templates.pm b/C4/Templates.pm index 21604fc..ff887c0 100644 --- a/C4/Templates.pm +++ b/C4/Templates.pm @@ -124,7 +124,7 @@ sub output { utf8_hashref($vars->{$k}); } else { - utf8::encode($vars->{$k}) if utf8::is_utf8($vars->{$k}); + utf8::encode($vars->{$k}) if(utf8::decode($vars->{$k}) || utf8::is_utf8($vars->{$k})); } } my $data; @@ -145,7 +145,7 @@ sub utf8_arrayref { utf8_hashref($element); next; } - utf8::encode($element) if utf8::is_utf8($element); + utf8::encode($element) if(utf8::decode($element) || utf8::is_utf8($element)); } } @@ -160,7 +160,7 @@ sub utf8_hashref { utf8_hashref($hashref->{$key}); next; } - utf8::encode($hashref->{$key}) if utf8::is_utf8($hashref->{$key}); + utf8::encode($hashref->{$key}) if(utf8::decode($hashref->{$key}) || utf8::is_utf8($hashref->{$key})); } } -- 1.7.1