aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-01-16 13:42:30 -0400
committerJoey Hess <joey@kitenet.net>2012-01-16 13:42:30 -0400
commit18f35269c26dd23e1c91c5e930ed5d62526b558f (patch)
tree8cb66eb13a0f644cd386b5780ceb29eb47582085 /IkiWiki/Plugin
parent45d9548940cb9e30a5c453cb367e22bddaf26041 (diff)
downloadikiwiki-18f35269c26dd23e1c91c5e930ed5d62526b558f.tar
ikiwiki-18f35269c26dd23e1c91c5e930ed5d62526b558f.tar.gz
mdwn: Added nodiscount setting, which can be used to avoid using the markdown discount engine, when maximum compatability is needed.
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/mdwn.pm10
1 files changed, 9 insertions, 1 deletions
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 {