FUCK UTF8 fuck fuck fuck!!!

[git.ikiwiki.info.git] / IkiWiki / CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 9d2ad8cdd11de28091449e7048b69d34a4eaace9..f589ca41da60d39d1d7f7d774598f891313403b2 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -4,6 +4,7 @@ use warnings;
 use strict;
 use IkiWiki;
 use IkiWiki::UserInfo;
+use encoding 'utf8'; # force use of utf8 for io layer
 
 package IkiWiki;
 
@@ -32,6 +33,11 @@ sub cgi_recentchanges ($) { #{{{
        
        unlockwiki();
 
+       # 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"
        );
@@ -43,8 +49,7 @@ sub cgi_recentchanges ($) { #{{{
                styleurl => styleurl(),
                baseurl => "$config{url}/",
        );
-       require Encode;
-       print $q->header(-charset=>'utf-8'), Encode::decode_utf8($template->output);
+       print $q->header(-charset=>'utf-8'), $template->output;
 } #}}}
 
 sub cgi_signin ($$) { #{{{