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 4be5612f1bf8df3d3090dda0ad9963f866a201f4..7be1c7f589c0f9cccddc1a05e209a2f55da1f6a2 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,7 +3,8 @@
 package IkiWiki;
 use warnings;
 use strict;
 package IkiWiki;
 use warnings;
 use strict;

-use encoding "utf8";
+use encoding "utf8"; # force use of utf8 for io layer
+use Encode;

 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};


@@ -393,7 +394,6 @@ sub saveindex () { #{{{
 sub template_params (@) { #{{{
        my $filename=shift;
        
 sub template_params (@) { #{{{
        my $filename=shift;
        

-       require Encode;

        require HTML::Template;
        return filter => sub {
                        my $text_ref = shift;
        require HTML::Template;
        return filter => sub {
                        my $text_ref = shift;