From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 23 Oct 2009 16:38:30 +0000 (-0400)
Subject: inline: Fix raw mode. Closes: #552114
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/789e0bfd6b43c20697bad7f69633e1f49a01cc5a

inline: Fix raw mode. Closes: #552114
---

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index a836c18f4..942df6f89 100644
--- 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 9b0cd5f52..278ea01bc 100644
--- 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