urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mdwn: Added nodiscount setting, which can be used to avoid using the markdown discount engine, when maximum compatability is needed.

master
Joey Hess 2012-01-16 13:42:30 -04:00
parent 45d9548940
commit 18f35269c2
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki/Plugin/mdwn.pm
View File

@ -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 {

7
debian/changelog vendored
View File

@ -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.