From cf6c2f142fdcba4316f616bad5aaa88c6df6031e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 25 Jul 2008 17:52:00 -0400
Subject: add getsetup

Also, avoid dying with a fatal error if multimarkdown is enabled and the
module doesh't load.
---
 IkiWiki/Plugin/mdwn.pm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'IkiWiki/Plugin/mdwn.pm')

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 11f3f0137..920d90e5e 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -7,9 +7,21 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+	hook(type => "getsetup", id => "mdwn", call => \&getsetup);
 	hook(type => "htmlize", id => "mdwn", call => \&htmlize);
 } # }}}
 
+sub getsetup () { #{{{
+	return
+		multimarkdown => {
+			type => "boolean",
+			default => 0,
+			description => "enable use of multimarkdown features",
+			safe => 1,
+			rebuild => 1,
+		},
+} #}}}
+
 my $markdown_sub;
 sub htmlize (@) { #{{{
 	my %params=@_;
@@ -25,13 +37,13 @@ sub htmlize (@) { #{{{
 		if (exists $config{multimarkdown} && $config{multimarkdown}) {
 			eval q{use Text::MultiMarkdown};
 			if ($@) {
-				error(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
+				debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed"));
 			}
 			$markdown_sub=sub {
 				Text::MultiMarkdown::markdown(shift, {use_metadata => 0});
 			}
 		}
-		else {
+		if (! defined $markdown_sub) {
 			eval q{use Text::Markdown};
 			if (! $@) {
 				if (Text::Markdown->can('markdown')) {
-- 
cgit v1.2.3