Encode is used in nearly all code paths so stop loading it on demand

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e86581415c9ff5ef12fe4fc6ca89174eb3646aa8..7be1c7f589c0f9cccddc1a05e209a2f55da1f6a2 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,6 +3,8 @@
 package IkiWiki;
 use warnings;
 use strict;
+use encoding "utf8"; # force use of utf8 for io layer
+use Encode;
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
@@ -340,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;
@@ -372,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};
@@ -392,7 +394,6 @@ sub saveindex () { #{{{
 sub template_params (@) { #{{{
        my $filename=shift;
        
-       require Encode;
        require HTML::Template;
        return filter => sub {
                        my $text_ref = shift;