mdwn: Avoid trying to use multimarkdown if it is not installed.

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index c62780cb892b37a9c5dd8b6c5230bdd4e4567d2e..3de59ef3d036d56f7fa4876f8a1020ad59d994aa 100644 (file)
--- 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"));
                        }
                        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) {
                        }
                }
                if (! defined $markdown_sub) {

diff --git a/debian/changelog b/debian/changelog
index 3d910e3ba2951b9656898fbdeb6f7c840f5be5e9..33692431762456ae505f1f28fc9ca48e56de2e8b 100644 (file)
--- 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.
 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
 
 
  -- Joey Hess <joeyh@debian.org>  Mon, 26 Oct 2009 11:53:32 -0400