pagestats: add disp parameter

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 338468e23b8bb7d0353424c2b849b153b1d75ee4..014e78eea124604e249d35d42a6b9ccf6524c254 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -25,6 +25,13 @@ sub getsetup () {
                        safe => 1,
                        rebuild => 1,
                },
                        safe => 1,
                        rebuild => 1,
                },

+               nodiscount => {
+                       type => "boolean",
+                       example => 0,
+                       description => "disable use of markdown discount?",
+                       safe => 1,
+                       rebuild => 1,
+               },

 }
 
 my $markdown_sub;
 }
 
 my $markdown_sub;


@@ -50,7 +57,8 @@ sub htmlize (@) {
                                }
                        }
                }
                                }
                        }
                }

-               if (! defined $markdown_sub) {
+               if (! defined $markdown_sub &&
+                   (! exists $config{nodiscount} || ! $config{nodiscount})) {

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


@@ -84,8 +92,9 @@ sub htmlize (@) {
                                        $markdown_sub=\&Markdown::Markdown;
                                }
                                else {
                                        $markdown_sub=\&Markdown::Markdown;
                                }
                                else {

+                                       my $error = $@;

                                        do "/usr/bin/markdown" ||
                                        do "/usr/bin/markdown" ||

-                                               error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $@, $!));
+                                               error(sprintf(gettext("failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"), $error, $!));

                                        $markdown_sub=\&Markdown::Markdown;
                                }
                        }
                                        $markdown_sub=\&Markdown::Markdown;
                                }
                        }