inline: Fix raw mode. Closes: #552114

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a836c18f41c9466a647b58149d04d05f889cb4e7..942df6f89cf67381b66cea89ada37bba1f419620 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -332,7 +332,7 @@ sub preprocess_inline (@) {
                        error sprintf(gettext("nonexistant template %s"), $params{template});
                }
                my $template=HTML::Template->new(@params) unless $raw;
-               my $needcontent=!($archive && $quick) && $template->query(name => 'content');
+               my $needcontent=$raw || (!($archive && $quick) && $template->query(name => 'content'));
        
                foreach my $page (@list) {
                        my $file = $pagesources{$page};

diff --git a/debian/changelog b/debian/changelog
index 9b0cd5f524b0a2eadc0dd7b84e74fdb9f6f988e6..278ea01bcb96c317d4b6a408c4025170755e6c94 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20091023) UNRELEASED; urgency=low
+
+  * inline: Fix raw mode. Closes: #552114
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 23 Oct 2009 12:37:51 -0400
+
 ikiwiki (3.20091022) unstable; urgency=low
 
   * edittemplate: Allow template page name to be specified using anything