aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/mdwn.pm6
-rw-r--r--debian/changelog1
2 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index c62780cb8..3de59ef3d 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -43,8 +43,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) {
diff --git a/debian/changelog b/debian/changelog
index 3d910e3ba..336924317 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ikiwiki (3.20091024) UNRELEASED; urgency=low
* po: Fix breakage caused by changes to render code.
+ * mdwn: Avoid trying to use multimarkdown if it is not installed.
-- Joey Hess <joeyh@debian.org> Mon, 26 Oct 2009 11:53:32 -0400