fix

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 4be5612f1bf8df3d3090dda0ad9963f866a201f4..c2c3aac83825aef47f8b8733ee561c3e2f9f2fbc 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -3,7 +3,8 @@
 package IkiWiki;
 use warnings;
 use strict;
-use encoding "utf8";
+use Encode;
+use open qw{:utf8 :std};
 
 use vars qw{%config %links %oldlinks %oldpagemtime %pagectime
             %renderedfiles %pagesources %depends %hooks};
@@ -41,7 +42,7 @@ sub defaultconfig () { #{{{
        setup => undef,
        adminuser => undef,
        adminemail => undef,
-       plugin => [qw{inline htmlscrubber}],
+       plugin => [qw{mdwn inline htmlscrubber}],
        timeformat => '%c',
 } #}}}
            
@@ -122,12 +123,10 @@ sub dirname ($) { #{{{
 sub pagetype ($) { #{{{
        my $page=shift;
        
-       if ($page =~ /\.mdwn$/) {
-               return ".mdwn";
-       }
-       else {
-               return "unknown";
+       if ($page =~ /\.(.*)$/) {
+               return $1 if exists $hooks{htmlize}{$1};
        }
+       return undef;
 } #}}}
 
 sub pagename ($) { #{{{
@@ -135,7 +134,7 @@ sub pagename ($) { #{{{
 
        my $type=pagetype($file);
        my $page=$file;
-       $page=~s/\Q$type\E*$// unless $type eq 'unknown';
+       $page=~s/\Q.$type\E*$// if defined $type;
        return $page;
 } #}}}
 
@@ -163,12 +162,7 @@ sub readfile ($;$) { #{{{
        
        local $/=undef;
        open (IN, $file) || error("failed to read $file: $!");
-       if (! $binary) {
-               binmode(IN, ":utf8");
-       }
-       else {
-               binmode(IN);
-       }
+       binmode(IN) if ($binary);
        my $ret=<IN>;
        close IN;
        return $ret;
@@ -200,12 +194,7 @@ sub writefile ($$$;$) { #{{{
        }
        
        open (OUT, ">$destdir/$file") || error("failed to write $destdir/$file: $!");
-       if (! $binary) {
-               binmode(OUT, ":utf8");
-       }
-       else {
-               binmode(OUT);
-       }
+       binmode(OUT) if ($binary);
        print OUT $content;
        close OUT;
 } #}}}
@@ -341,7 +330,7 @@ sub unlockwiki () { #{{{
 } #}}}
 
 sub loadindex () { #{{{
-       open (IN, "<:utf8", "$config{wikistatedir}/index") || return;
+       open (IN, "$config{wikistatedir}/index") || return;
        while (<IN>) {
                $_=possibly_foolish_untaint($_);
                chomp;
@@ -373,7 +362,7 @@ sub saveindex () { #{{{
        if (! -d $config{wikistatedir}) {
                mkdir($config{wikistatedir});
        }
-       open (OUT, ">:utf8", "$config{wikistatedir}/index") || 
+       open (OUT, ">$config{wikistatedir}/index") || 
                error("cannot write to $config{wikistatedir}/index: $!");
        foreach my $page (keys %oldpagemtime) {
                next unless $oldpagemtime{$page};
@@ -393,7 +382,6 @@ sub saveindex () { #{{{
 sub template_params (@) { #{{{
        my $filename=shift;
        
-       require Encode;
        require HTML::Template;
        return filter => sub {
                        my $text_ref = shift;