lockedit: Detect if no authentication plugins are enabled, and die with an error...

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

diff --git a/IkiWiki/Plugin/wikitext.pm b/IkiWiki/Plugin/wikitext.pm
index 5c46c565cc7b95100c3124fa9a3c496bb4afc502..accb03bbef8317cad028d95fe36a68b466d9bd0f 100644 (file)
--- a/IkiWiki/Plugin/wikitext.pm
+++ b/IkiWiki/Plugin/wikitext.pm
@@ -4,18 +4,29 @@ package IkiWiki::Plugin::wikitext;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

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

 
 

-sub import { #{{{
-       IkiWiki::hook(type => "htmlize", id => "wiki", call => \&htmlize);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "wiki", call => \&getsetup);
+       hook(type => "htmlize", id => "wiki", call => \&htmlize);
+}

 
 

-sub htmlize (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 0, # format plugin
+                       rebuild => undef,
+               },
+}
+
+
+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 });

-} # }}}
+}

 
 1
 
 1