Merge commit 'upstream/master' into pub/po

[ikiwiki.git] / IkiWiki / Plugin / format.pm

diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index a219190e820a4f579a389c223a536a371e357ef7..bbe3aa9fee56e28b978e8d11c0f5f71d6d1b8824 100644 (file)
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -3,13 +3,13 @@ package IkiWiki::Plugin::format;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+sub import {
        hook(type => "preprocess", id => "format", call => \&preprocess);
-} #}}}
+}
 
-sub preprocess (@) { #{{{
+sub preprocess (@) {
        my $format=$_[0];
        shift; shift;
        my $text=$_[0];
@@ -23,7 +23,8 @@ sub preprocess (@) { #{{{
                error(sprintf(gettext("unsupported page format %s"), $format));
        }
 
-       return IkiWiki::htmlize($params{page}, $params{destpage}, $format, $text);
-} #}}}
+       return IkiWiki::htmlize($params{page}, $params{destpage}, $format,
+               IkiWiki::preprocess($params{page}, $params{destpage}, $text));
+}
 
 1