Merge remote branch 'kc/master' into new/enh/bug_5917

[koha-ffzg.git] / C4 / Templates.pm

diff --git a/C4/Templates.pm b/C4/Templates.pm
index 0035698..91b57fb 100644 (file)
--- a/C4/Templates.pm
+++ b/C4/Templates.pm
@@ -108,7 +108,9 @@ sub param{
     while(@_){
        my $key = shift;
        my $val = shift;
-        utf8::decode($val) if utf8::is_utf8($val);
+        utf8::encode($val) if utf8::is_utf8($val);
+        if( ref($val) eq 'ARRAY' && ! scalar @$val ){ $val = undef; }
+        elsif( ref($val) eq 'HASH' && ! scalar %$val ){ $val = undef; }
        $self->{VARS}->{$key} = $val;
     }
 }