diff options
| -rw-r--r-- | IkiWiki/Plugin/mdwn.pm | 6 | ||||
| -rw-r--r-- | IkiWiki/Plugin/po.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 7 |
3 files changed, 12 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index c62780cb8..3de59ef3d 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -43,8 +43,10 @@ sub htmlize (@) { if ($@) { debug(gettext("multimarkdown is enabled, but Text::MultiMarkdown is not installed")); } - $markdown_sub=sub { - Text::MultiMarkdown::markdown(shift, {use_metadata => 0}); + else { + $markdown_sub=sub { + Text::MultiMarkdown::markdown(shift, {use_metadata => 0}); + } } } if (! defined $markdown_sub) { diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index d9aa9bfda..02fc4a89e 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -386,8 +386,7 @@ sub change (@) { resetalreadyfiltered(); require IkiWiki::Render; foreach my $file (@rendered) { - debug(sprintf(gettext("building %s"), $file)); - IkiWiki::render($file); + IkiWiki::render($file, sprintf(gettext("building %s"), $file)); } } diff --git a/debian/changelog b/debian/changelog index c73aa53d7..336924317 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20091024) UNRELEASED; urgency=low + + * po: Fix breakage caused by changes to render code. + * mdwn: Avoid trying to use multimarkdown if it is not installed. + + -- Joey Hess <joeyh@debian.org> Mon, 26 Oct 2009 11:53:32 -0400 + ikiwiki (3.20091023) unstable; urgency=low * inline: Fix raw mode. Closes: #552114 |