cherry-pick uri security fix

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

diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index 95182f870c671a8c758e35231df93494464ad889..e1d346ae67d19962fc732759e540c17776d8f2a6 100644 (file)
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -4,8 +4,7 @@ package IkiWiki::Plugin::wikitext;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
-use Text::WikiFormat;
+use IkiWiki 2.00;

 
 sub import { #{{{
        hook(type => "htmlize", id => "wiki", call => \&htmlize);
 
 sub import { #{{{
        hook(type => "htmlize", id => "wiki", call => \&htmlize);


@@ -15,6 +14,8 @@ sub htmlize (@) { #{{{
        my %params=@_;
        my $content = $params{content};
 
        my %params=@_;
        my $content = $params{content};
 

+       eval q{use Text::WikiFormat};
+       return $content if $@;

        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
 } # }}}
 
        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
 } # }}}