From 18f35269c26dd23e1c91c5e930ed5d62526b558f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 16 Jan 2012 13:42:30 -0400
Subject: [PATCH] mdwn: Added nodiscount setting, which can be used to avoid
using the markdown discount engine, when maximum compatability is needed.
---
IkiWiki/Plugin/mdwn.pm | 10 +++++++++-
debian/changelog | 7 +++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 338468e23..3c3fc9579 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -25,6 +25,13 @@ sub getsetup () {
safe => 1,
rebuild => 1,
},
+ nodiscount => {
+ type => "boolean",
+ example => 0,
+ description => "disable use of markdown discount?",
+ safe => 1,
+ rebuild => 1,
+ },
}
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 {
diff --git a/debian/changelog b/debian/changelog
index 1eab184f5..d014abd50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20120116) UNRELEASED; urgency=low
+
+ * mdwn: Added nodiscount setting, which can be used to avoid using the
+ markdown discount engine, when maximum compatability is needed.
+
+ -- Joey Hess <joeyh@debian.org> Mon, 16 Jan 2012 13:41:14 -0400
+
ikiwiki (3.20120115) unstable; urgency=low
* Make backlink(.) work. Thanks, Giuseppe Bilotta.
--
2.39.5