Bug 30891: (QA follow-up) Add check to patron details page

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

diff --git a/C4/Message.pm b/C4/Message.pm
index e4dafdb..3a32166 100644 (file)
--- a/C4/Message.pm
+++ b/C4/Message.pm
@@ -22,9 +22,10 @@ package C4::Message;
 use strict;
 use warnings;
 use C4::Context;
-use C4::Letters;
-use YAML::Syck;
-use Carp;
+use C4::Letters qw( GetPreparedLetter EnqueueLetter );
+use YAML::XS qw( Dump );
+use Encode;
+use Carp qw( carp );
 
 =head1 NAME
 
@@ -165,7 +166,7 @@ sub enqueue {
     my $body = join('', map { $format->($_) } @{$metadata->{body}});
     $letter->{content} = $metadata->{header} . $body . $metadata->{footer};
 
-    $letter->{metadata} = Dump($metadata);
+    $letter->{metadata} = Encode::decode_utf8(Dump($metadata));
     C4::Letters::EnqueueLetter({
         letter                 => $letter,
         borrowernumber         => $borrower->{borrowernumber},
@@ -278,11 +279,11 @@ sub metadata {
         $data->{header} ||= '';
         $data->{body}   ||= [];
         $data->{footer} ||= '';
-        $self->{metadata} = Dump($data);
+        $self->{metadata} = Encode::decode_utf8(Dump($data));
         $self->content($self->render_metadata);
         return $data;
     } else {
-        return Load($self->{metadata});
+        return YAML::XS::Load(Encode::encode_utf8($self->{metadata}));
     }
 }