Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index c47ccb7b1aded4ea75f096122a39000bda34cdd1..b24630b15bf9c380e2b68af44f59bcffaaf5bb70 100644 (file)
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -4,29 +4,30 @@ package IkiWiki::Plugin::wikitext;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {

        hook(type => "getsetup", id => "wiki", call => \&getsetup);
        hook(type => "htmlize", id => "wiki", call => \&htmlize);
        hook(type => "getsetup", id => "wiki", call => \&getsetup);
        hook(type => "htmlize", id => "wiki", call => \&htmlize);

-} # }}}
+}

 
 

-sub getsetup () { #{{{
+sub getsetup () {

        return
                plugin => {
                        safe => 0, # format plugin
                        rebuild => undef,
        return
                plugin => {
                        safe => 0, # format plugin
                        rebuild => undef,

+                       section => "format",

                },
                },

-} #}}}
+}

 
 
 
 

-sub htmlize (@) { #{{{
+sub htmlize (@) {

        my %params=@_;
        my $content = $params{content};
 
        eval q{use Text::WikiFormat};
        return $content if $@;
        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });
        my %params=@_;
        my $content = $params{content};
 
        eval q{use Text::WikiFormat};
        return $content if $@;
        return Text::WikiFormat::format($content, undef, { implicit_links => 0 });

-} # }}}
+}

 
 1
 
 1