Merge commit 'upstream/master'

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

diff --git a/IkiWiki/Plugin/textile.pm b/IkiWiki/Plugin/textile.pm
index ee8e88ed206bd6cabda1f7fb4c9d46cec84aa48b..bbd282f0c8dd09035f03eadc85fbd3ea0823cf7a 100644 (file)
--- a/IkiWiki/Plugin/textile.pm
+++ b/IkiWiki/Plugin/textile.pm
@@ -6,15 +6,25 @@ package IkiWiki::Plugin::textile;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
+use Encode;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "textile", call => \&getsetup);
        hook(type => "htmlize", id => "txtl", call => \&htmlize);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => 1, # format plugin
+               },
+} #}}}
+
 sub htmlize (@) { #{{{
        my %params=@_;
-       my $content = $params{content};
+       my $content = decode_utf8(encode_utf8($params{content}));
 
        eval q{use Text::Textile};
        return $content if $@;