Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm
index c62780cb892b37a9c5dd8b6c5230bdd4e4567d2e..3de59ef3d036d56f7fa4876f8a1020ad59d994aa 100644 (file)
--- 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 d9aa9bfda40fa86bd463943a565cd0f1c5cd47b5..02fc4a89edee391eae291c104d4d3ef113e74e8c 100644 (file)
--- 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 c73aa53d7a98e46f3b264b41ce9d720c55cc5ed3..33692431762456ae505f1f28fc9ca48e56de2e8b 100644 (file)
--- 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