highlight: Ensure that other, more-specific format plugins, like txt are used in...

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a04dd6630b9ee3f01ebc1e0887f656416c860fc8..c00aed299c8fa2cd27508f2ded85a9f000da7930 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -336,10 +336,7 @@ sub preprocess_inline (@) {
                                        blind_cache => 1);
                        };
                        if ($@) {
-                               error gettext("failed to process template:")." $@";
-                       }
-                       if (! $template) {
-                               error sprintf(gettext("template %s not found"), $params{template}.".tmpl");
+                               error sprintf(gettext("failed to process template %s"), $params{template}.".tmpl").": $@";
                        }
                }
                my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));
@@ -403,7 +400,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 +471,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