Merge branch 'master' into pedigree

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

diff --git a/IkiWiki/Plugin/textile.pm b/IkiWiki/Plugin/textile.pm
index 5de71bf6eb11aa682dde75eaac98970b4174c9f9..208f295d2b16aeb37c4434253c46d48d66057222 100644 (file)
--- a/IkiWiki/Plugin/textile.pm
+++ b/IkiWiki/Plugin/textile.pm
@@ -7,6 +7,7 @@ package IkiWiki::Plugin::textile;
 use warnings;
 use strict;
 use IkiWiki 2.00;
+use Encode;
 
 sub import { #{{{
        hook(type => "htmlize", id => "txtl", call => \&htmlize);
@@ -14,7 +15,7 @@ sub import { #{{{
 
 sub htmlize (@) { #{{{
        my %params=@_;
-       my $content = $params{content};
+       my $content = decode_utf8(encode_utf8($params{content}));
 
        eval q{use Text::Textile};
        return $content if $@;