Pass array of names of files that have been deleted to needsbuild hook as second...

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a04dd6630b9ee3f01ebc1e0887f656416c860fc8..20c5f3bddc08473bd06f27dfa5f5c3e35e1b22c0 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -403,7 +403,7 @@ sub preprocess_inline (@) {
                                              linkify($page, $params{destpage},
                                              preprocess($page, $params{destpage},
                                              filter($page, $params{destpage},
-                                             readfile(srcfile($file)), 'fullpage')));
+                                             readfile(srcfile($file)))));
                                }
                                else {
                                        $ret.="\n".
@@ -474,7 +474,7 @@ sub get_inline_content ($$) {
                       linkify($page, $destpage,
                       preprocess($page, $destpage,
                       filter($page, $destpage,
-                      readfile(srcfile($file)), 'fullpage'))));
+                      readfile(srcfile($file))))));
                $nested--;
                if (isinternal($page)) {
                        # make inlined text of internal pages searchable
@@ -570,9 +570,9 @@ sub genfeed ($$$$$@) {
                        }
                }
 
+               my $file=$pagesources{$p};
+               my $type=pagetype($file);
                if ($itemtemplate->query(name => "enclosure")) {
-                       my $file=$pagesources{$p};
-                       my $type=pagetype($file);
                        if (defined $type) {
                                $itemtemplate->param(content => $pcontent);
                        }
@@ -591,6 +591,7 @@ sub genfeed ($$$$$@) {
                        }
                }
                else {
+                       next unless defined $type;
                        $itemtemplate->param(content => $pcontent);
                }