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

[ikiwiki.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 3be8e1c53ff96973891c758875b93d9ac3cc2bfc..960d1da1e7fbd7c4c64fea6cb24082d1b41521e5 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -6,6 +6,7 @@ use warnings;
 use strict;
 use File::Spec;
 use IkiWiki;
+use Encode;
 
 sub linkify ($$$) { #{{{
        my $lpage=shift;
@@ -31,7 +32,6 @@ sub htmlize ($$) { #{{{
                $blosxom::version="is a proper perl module too much to ask?";
                use warnings 'all';
                do "/usr/bin/markdown";
-               require Encode;
        }
        
        if ($type eq '.mdwn') {
@@ -327,6 +327,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
+                       $_ = Encode::decode_utf8($_);
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }
@@ -346,6 +347,7 @@ sub refresh () { #{{{
        find({
                no_chdir => 1,
                wanted => sub {
+                       $_ = Encode::decode_utf8($_);
                        if (/$config{wiki_file_prune_regexp}/) {
                                $File::Find::prune=1;
                        }
@@ -405,7 +407,7 @@ sub refresh () { #{{{
                
                if (! exists $oldpagemtime{$page} ||
                    mtime(srcfile($file)) > $oldpagemtime{$page}) {
-                       debug("rendering changed file $file");
+                       debug("rendering $file");
                        render($file);
                        $rendered{$file}=1;
                }