Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index b892eabee29be50387fa493baafd5dbd6d1024a8..b10d085174c5d808c322f8c78bc48c8ecaa6bc39 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -50,6 +50,17 @@ sub htmlize (@) {
                                }
                        }
                }
                                }
                        }
                }

+               if (! defined $markdown_sub) {
+                       eval q{use Text::Markdown::Discount};
+                       if (! $@) {
+                               $markdown_sub=sub {
+                                       # Workaround for discount binding bug
+                                       # https://rt.cpan.org/Ticket/Display.html?id=73657
+                                       return "" if $_[0]=~/^\s*$/;
+                                       Text::Markdown::Discount::markdown(@_);
+                               }
+                       }
+               }

                if (! defined $markdown_sub) {
                        eval q{use Text::Markdown};
                        if (! $@) {
                if (! defined $markdown_sub) {
                        eval q{use Text::Markdown};
                        if (! $@) {