aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-03-04 20:17:55 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-03-04 20:17:55 -0500
commit0217eebf4901860dd04cbf22ee0d81b69b1396a0 (patch)
tree99c4f91cb06f3202470f32acb81cddf38036b1ba
parent713845f34223a0401e42b3b1299868db355e84c0 (diff)
downloadikiwiki-0217eebf4901860dd04cbf22ee0d81b69b1396a0.tar
ikiwiki-0217eebf4901860dd04cbf22ee0d81b69b1396a0.tar.gz
* Use Text::Markdown::markdown, since version 1.0.16 of Text::Markdown
no longer supports Text::Markdown::Markdown. All old versions of Text::Markdown also support the lower-case version.
-rw-r--r--IkiWiki/Plugin/mdwn.pm2
-rw-r--r--debian/changelog3
2 files changed, 4 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index 254ab51d0..cabf44aa5 100644
--- a/IkiWiki/Plugin/mdwn.pm
+++ b/IkiWiki/Plugin/mdwn.pm
@@ -30,7 +30,7 @@ sub htmlize (@) { #{{{
else {
eval q{use Text::Markdown};
if (! $@) {
- $markdown_sub=\&Text::Markdown::Markdown;
+ $markdown_sub=\&Text::Markdown::markdown;
}
else {
do "/usr/bin/markdown" ||
diff --git a/debian/changelog b/debian/changelog
index a9d530c1e..1edab22fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ ikiwiki (2.41) UNRELEASED; urgency=low
* rcs_diff is a new function that rcs modules should implement.
* Implemented rcs_diff for git, svn, and tla (tla version untested).
Mercurial and monotone still todo.
+ * Use Text::Markdown::markdown, since version 1.0.16 of Text::Markdown
+ no longer supports Text::Markdown::Markdown. All old versions of
+ Text::Markdown also support the lower-case version.
-- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100