X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b0e7e2e123079a2e68924cfb90d19c44571b1f65..929b9de9c2b0f3ed1a0c9e006d084519bd5e0479:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a2af406a9..7be1c7f58 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,8 +3,8 @@
 package IkiWiki;
 use warnings;
 use strict;
-use File::Spec;
-use HTML::Template;
+use encoding "utf8"; # force use of utf8 for io layer
+use Encode;
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
@@ -304,6 +304,7 @@ sub htmllink ($$$;$$$) { #{{{
 			"\">?</a>$linktext</span>"
 	}
 	
+	require File::Spec;
 	$bestlink=File::Spec->abs2rel($bestlink, dirname($page));
 	
 	if (! $noimageinline && isinlinableimage($bestlink)) {
@@ -341,7 +342,7 @@ sub unlockwiki () { #{{{
 } #}}}
 
 sub loadindex () { #{{{
-	open (IN, "$config{wikistatedir}/index") || return;
+	open (IN, "<:utf8", "$config{wikistatedir}/index") || return;
 	while (<IN>) {
 		$_=possibly_foolish_untaint($_);
 		chomp;
@@ -373,7 +374,7 @@ sub saveindex () { #{{{
 	if (! -d $config{wikistatedir}) {
 		mkdir($config{wikistatedir});
 	}
-	open (OUT, ">$config{wikistatedir}/index") || 
+	open (OUT, ">:utf8", "$config{wikistatedir}/index") || 
 		error("cannot write to $config{wikistatedir}/index: $!");
 	foreach my $page (keys %oldpagemtime) {
 		next unless $oldpagemtime{$page};
@@ -390,13 +391,26 @@ sub saveindex () { #{{{
 	close OUT;
 } #}}}
 
+sub template_params (@) { #{{{
+	my $filename=shift;
+	
+	require HTML::Template;
+	return filter => sub {
+			my $text_ref = shift;
+			$$text_ref=&Encode::decode_utf8($$text_ref);
+		},
+		filename => "$config{templatedir}/$filename", @_;
+} #}}}
+
+sub template ($;@) { #{{{
+	HTML::Template->new(template_params(@_));
+} #}}}
+
 sub misctemplate ($$) { #{{{
 	my $title=shift;
 	my $pagebody=shift;
 	
-	my $template=HTML::Template->new(
-		filename => "$config{templatedir}/misc.tmpl"
-	);
+	my $template=template("misc.tmpl");
 	$template->param(
 		title => $title,
 		indexlink => indexlink(),