Merge branch 'master' into debian-jessie-backports

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 3c3fc9579fc7fa78959fad3e4ddf7b3bf67ce003..daf9d592e4189e1e06d279b568e43db3b3858262 100644 (file)
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -9,6 +9,7 @@ use IkiWiki 3.00;
 sub import {
        hook(type => "getsetup", id => "mdwn", call => \&getsetup);
        hook(type => "htmlize", id => "mdwn", call => \&htmlize, longname => "Markdown");
 sub import {
        hook(type => "getsetup", id => "mdwn", call => \&getsetup);
        hook(type => "htmlize", id => "mdwn", call => \&htmlize, longname => "Markdown");

+       hook(type => "htmlize", id => "md", call => \&htmlize, longname => "Markdown (popular file extension)", nocreate => 1);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -58,7 +59,7 @@ sub htmlize (@) {
                        }
                }
                if (! defined $markdown_sub &&
                        }
                }
                if (! defined $markdown_sub &&

-                   exists $config{nodiscount} && ! $config{nodiscount}) {
+                   (! 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 {


@@ -92,8 +93,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;
                                }
                        }