From: Joey Hess <joey@kitenet.net>
Date: Mon, 23 Jan 2012 22:16:26 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.ikiwiki.info
X-Git-Tag: 3.20120202~53
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/0376a8da8ac42a4c7da4acfd588767ff8e062364?hp=354e4aaa04eedaa02e99aa670b807d0da41c5f47

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

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 3c3fc9579..430194bff 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -58,7 +58,7 @@ sub htmlize (@) {
 			}
 		}
 		if (! defined $markdown_sub &&
-		    exists $config{nodiscount} && ! $config{nodiscount}) {
+		    (! exists $config{nodiscount} || ! $config{nodiscount})) {
 			eval q{use Text::Markdown::Discount};
 			if (! $@) {
 				$markdown_sub=sub {