403 response may be a "not found" too

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 553fd350c15dd173305d52da5e9b9c2e85be332a..942df6f89cf67381b66cea89ada37bba1f419620 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -332,13 +332,13 @@ sub preprocess_inline (@) {
                        error sprintf(gettext("nonexistant template %s"), $params{template});
                }
                my $template=HTML::Template->new(@params) unless $raw;
                        error sprintf(gettext("nonexistant template %s"), $params{template});
                }
                my $template=HTML::Template->new(@params) unless $raw;

+               my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));

        
                foreach my $page (@list) {
                        my $file = $pagesources{$page};
                        my $type = pagetype($file);
                        if (! $raw || ($raw && ! defined $type)) {
        
                foreach my $page (@list) {
                        my $file = $pagesources{$page};
                        my $type = pagetype($file);
                        if (! $raw || ($raw && ! defined $type)) {

-                               if (!($archive && $quick) &&
-                                   $template->query(name => 'content')) {
+                               if ($needcontent) {

                                        # Get the content before populating the
                                        # template, since getting the content uses
                                        # the same template if inlines are nested.
                                        # Get the content before populating the
                                        # template, since getting the content uses
                                        # the same template if inlines are nested.