Split infobox generation out into its own function.

[pr0n] / perl / Sesse / pr0n / Templates.pm

diff --git a/perl/Sesse/pr0n/Templates.pm b/perl/Sesse/pr0n/Templates.pm
index aac4058fc8ab183bef468f9d938f97201013e2e2..ecac13f623d3c6e29e5bd59fc3a8e086c129de61 100644 (file)
--- a/perl/Sesse/pr0n/Templates.pm
+++ b/perl/Sesse/pr0n/Templates.pm
@@ -56,7 +56,7 @@ sub fetch_template {
        my $newcache = {};
 
        my $base = $Sesse::pr0n::Config::template_base;
-       open TEMPLATE, "<$base/$dir/$template"
+       open TEMPLATE, "<:utf8", "$base/$dir/$template"
                or ($dir ne 'default' and open TEMPLATE, "<$base/default/$template")
                or Sesse::pr0n::Common::error($r, "Couldn't open $dir/$template: $!");
 
@@ -85,7 +85,7 @@ sub process_template {
 
 sub print_template {
        my ($r, $io, $template, $args) = @_;
-       $io->print(process_template($r, $template, $args));
+       $io->print(Encode::encode_utf8(process_template($r, $template, $args)));
 }
 
 1;