Bugfix for trying to attach files to a subpage of the index page.

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

diff --git a/IkiWiki/Plugin/format.pm b/IkiWiki/Plugin/format.pm
index 1513cbed72a67447fa8bcedd9bff1f10ce076262..b596bc0a10343b91cf7287f5b5fa06a81084b055 100644 (file)
--- a/IkiWiki/Plugin/format.pm
+++ b/IkiWiki/Plugin/format.pm
@@ -7,6 +7,16 @@ use IkiWiki 3.00;
 
 sub import {
        hook(type => "preprocess", id => "format", call => \&preprocess);
 
 sub import {
        hook(type => "preprocess", id => "format", call => \&preprocess);

+       hook(type => "getsetup",   id => "format", call => \&getsetup);
+}
+
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },

 }
 
 sub preprocess (@) {
 }
 
 sub preprocess (@) {


@@ -19,22 +29,24 @@ sub preprocess (@) {
        if (! defined $format || ! defined $text) {
                error(gettext("must specify format and text"));
        }
        if (! defined $format || ! defined $text) {
                error(gettext("must specify format and text"));
        }

+               
+       # Other plugins can register htmlizeformat hooks to add support
+       # for page types not suitable for htmlize, or that need special
+       # processing when included via format. Try them until one succeeds.
+       my $ret;
+       IkiWiki::run_hooks(htmlizeformat => sub {
+               $ret=shift->($format, $text)
+                       unless defined $ret;
+       });
+
+       if (defined $ret) {
+               return $ret;
+       }

        elsif (exists $IkiWiki::hooks{htmlize}{$format}) {
                return IkiWiki::htmlize($params{page}, $params{destpage},
                                        $format, $text);
        }
        else {
        elsif (exists $IkiWiki::hooks{htmlize}{$format}) {
                return IkiWiki::htmlize($params{page}, $params{destpage},
                                        $format, $text);
        }
        else {

-               # Other plugins can register htmlizefallback
-               # hooks to add support for page types
-               # not suitable for htmlize. Try them until
-               # one succeeds.
-               my $ret;
-               IkiWiki::run_hooks(htmlizefallback => sub {
-                       $ret=shift->($format, $text)
-                               unless defined $ret;
-               });
-               return $ret if defined $ret;
-

                error(sprintf(gettext("unsupported page format %s"), $format));
        }
 }
                error(sprintf(gettext("unsupported page format %s"), $format));
        }
 }