X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/12c5786df4e74c143f24398b8d0028000b61daba..c321f5406b29e29b6ff61ab9e291a24d68e9d824:/IkiWiki/Plugin/mdwn.pm?ds=inline

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 332325adc..b892eabee 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -4,15 +4,20 @@ package IkiWiki::Plugin::mdwn;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
 	hook(type => "getsetup", id => "mdwn", call => \&getsetup);
-	hook(type => "htmlize", id => "mdwn", call => \&htmlize);
-} # }}}
+	hook(type => "htmlize", id => "mdwn", call => \&htmlize, longname => "Markdown");
+}
 
-sub getsetup () { #{{{
+sub getsetup () {
 	return
+		plugin => {
+			safe => 1,
+			rebuild => 1, # format plugin
+			section => "format",
+		},
 		multimarkdown => {
 			type => "boolean",
 			example => 0,
@@ -20,10 +25,10 @@ sub getsetup () { #{{{
 			safe => 1,
 			rebuild => 1,
 		},
-} #}}}
+}
 
 my $markdown_sub;
-sub htmlize (@) { #{{{
+sub htmlize (@) {
 	my %params=@_;
 	my $content = $params{content};
 
@@ -39,8 +44,10 @@ sub htmlize (@) { #{{{
 			if ($@) {
 				debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
 			}
-			$markdown_sub=sub {
-				Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
+			else {
+				$markdown_sub=sub {
+					Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
+				}
 			}
 		}
 		if (! defined $markdown_sub) {
@@ -79,6 +86,6 @@ sub htmlize (@) { #{{{
 	$content=Encode::decode_utf8($content);
 
 	return $content;
-} # }}}
+}
 
 1