new approach for forcing utf8 -- use a HTML::Template filter

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index d9c9fe82896c8f5a52490ccb7be3147684ace455..e02ab62a685da2e97da353d1c8a5b98cdf55ba1c 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -35,12 +35,9 @@ sub cgi_recentchanges ($) { #{{{
 
        # Force reading the template as utf-8, necessary if
        # rcs_recentchanges returns true utf-8 strings.
-       open(TMPL, "<:utf8", "$config{templatedir}/recentchanges.tmpl");
-       my $template=HTML::Template->new(filehandle => *TMPL);
-       close(TMPL);
-       my $template=HTML::Template->new(
-               filename => "$config{templatedir}/recentchanges.tmpl"
-       );
+       require Encode;
+       my $template=HTML::Template->new(filter => \&Encode::decode_utf8,
+               filename => "$config{templatedir}/recentchanges.tmpl");
        $template->param(
                title => "RecentChanges",
                indexlink => indexlink(),